diff --git a/.pipelines/templates/build.yaml b/.pipelines/templates/build.yaml
index 27a9209..1f08fa1 100644
--- a/.pipelines/templates/build.yaml
+++ b/.pipelines/templates/build.yaml
@@ -15,7 +15,7 @@ steps:
   inputs:
     pwsh: true
     filePath: $(System.DefaultWorkingDirectory)\scripts\build-cli.ps1
-    arguments: '-Stable ${{ parameters.stable }} -SkipMsix'
+    arguments: ${{ parameters.stable && '-Stable' || '' }} -SkipMsix
 - ${{ if eq(parameters['DoEsrp'], 'true') }}:
   - task: EsrpCodeSigning@5
     displayName: Code Sign ESRP - CLI
@@ -60,7 +60,7 @@ steps:
   inputs:
     pwsh: true
     filePath: $(System.DefaultWorkingDirectory)\scripts\package-msix.ps1
-    arguments: '-Stable ${{ parameters.stable }}'
+    arguments: -Version ${{ parameters.version }} ${{ parameters.stable && '-Stable' || '' }}
 - ${{ if eq(parameters['DoEsrp'], 'true') }}:
   - task: EsrpCodeSigning@5
     displayName: Code Sign ESRP - MSIX Packages
diff --git a/src/winapp-CLI/Directory.Build.props b/src/winapp-CLI/Directory.Build.props
index e4ba26e..5457b1a 100644
--- a/src/winapp-CLI/Directory.Build.props
+++ b/src/winapp-CLI/Directory.Build.props
@@ -16,5 +16,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="$(Configuration)=='Release'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <ControlFlowGuard>Guard</ControlFlowGuard>
   </PropertyGroup>
 </Project>