diff --git a/.pipelines/OneBranch.Official.yml b/.pipelines/OneBranch.Official.yml
index 996f2a60..cf292815 100644
--- a/.pipelines/OneBranch.Official.yml
+++ b/.pipelines/OneBranch.Official.yml
@@ -48,9 +48,6 @@ extends:
 
     stages:
     - stage: build
-      pool:
-        type: windows
-
       jobs:
       - template: .pipelines/jobs/OneBranchBuild.yml@self
         parameters:
diff --git a/.pipelines/OneBranch.PullRequest.yml b/.pipelines/OneBranch.PullRequest.yml
index bc08bbdd..ea488432 100644
--- a/.pipelines/OneBranch.PullRequest.yml
+++ b/.pipelines/OneBranch.PullRequest.yml
@@ -41,8 +41,6 @@ extends:
         enabled: false
       sbom:
         enabled: true
-      prefast:
-        enabled: true
 
     stages:
     - stage: build
diff --git a/.pipelines/jobs/OneBranchNuGet.yml b/.pipelines/jobs/OneBranchNuGet.yml
index 02133ee0..baaf7a9c 100644
--- a/.pipelines/jobs/OneBranchNuGet.yml
+++ b/.pipelines/jobs/OneBranchNuGet.yml
@@ -15,7 +15,10 @@ jobs:
     
     variables:
       ob_outputDirectory: '$(Build.SourcesDirectory)\out'
-      PackageVersion: ${{ parameters.BuildVersion }}
+      ${{ if eq(parameters.OfficialBuild, true) }}:
+        PackageVersion: ${{ parameters.BuildVersion }}
+      ${{ else }}:
+        PackageVersion: ${{ parameters.BuildVersion }}-unofficial
 
       ob_sdl_prefast_enabled: true
       ob_sdl_prefast_runDuring: 'Build'
@@ -72,4 +75,4 @@ jobs:
         displayName: 'Publish NuGet package'
         inputs:
           command: 'custom'
-          arguments: 'push $(ob_outputDirectory)\packages\Microsoft.Windows.CppWinRT.$(PackageVersion).nupkg -NonInteractive -Source https://microsoft.pkgs.visualstudio.com/_packaging/CppWinRT/nuget/v3/index.json -ApiKey VSTS'
\ No newline at end of file
+          arguments: 'push $(ob_outputDirectory)\packages\Microsoft.Windows.CppWinRT.$(PackageVersion).nupkg -NonInteractive -Source https://microsoft.pkgs.visualstudio.com/_packaging/CppWinRT/nuget/v3/index.json -ApiKey VSTS'
diff --git a/.pipelines/jobs/OneBranchVsix.yml b/.pipelines/jobs/OneBranchVsix.yml
index 18b74403..1b03f71d 100644
--- a/.pipelines/jobs/OneBranchVsix.yml
+++ b/.pipelines/jobs/OneBranchVsix.yml
@@ -27,6 +27,11 @@ jobs:
         VsixFilename: Microsoft.Windows.CppWinRT
   
   variables:
+    ${{ if eq(parameters.OfficialBuild, true) }}:
+      PackageVersion: ${{ parameters.BuildVersion }}
+    ${{ else }}:
+      PackageVersion: ${{ parameters.BuildVersion }}-unofficial
+
     ob_outputDirectory: $(Build.SourcesDirectory)\out
     ob_artifactSuffix: $(VsVersion)_$(Deployment)
 
@@ -91,7 +96,7 @@ jobs:
       displayName: Build VSIX
       inputs:
         solution: $(Build.SourcesDirectory)\vsix\vsix.sln
-        msbuildArgs: /t:vsix_$(VsVersion) /m /p:CppWinRTVersion=${{ parameters.BuildVersion }},clean_intermediate_files=true,Deployment=$(Deployment),NatvisDirx86=$(Build.SourcesDirectory)\x86\$(Deployment)\,NatvisDirx64=$(Build.SourcesDirectory)\x64\$(Deployment)\,NatvisDirarm64=$(Build.SourcesDirectory)\arm64\$(Deployment)\,NupkgDir=$(Pipeline.Workspace)\nuget\packages /bl:$(ob_outputDirectory)\output.binlog
+        msbuildArgs: /t:vsix_$(VsVersion) /m /p:CppWinRTVersion=$(PackageVersion),clean_intermediate_files=true,Deployment=$(Deployment),NatvisDirx86=$(Build.SourcesDirectory)\x86\$(Deployment)\,NatvisDirx64=$(Build.SourcesDirectory)\x64\$(Deployment)\,NatvisDirarm64=$(Build.SourcesDirectory)\arm64\$(Deployment)\,NupkgDir=$(Pipeline.Workspace)\nuget\packages /bl:$(ob_outputDirectory)\output.binlog
         platform: 'Any CPU'
         configuration: ${{ parameters.BuildConfiguration }}