diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml
index 4b449dc09d..56f23da15c 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml
@@ -8,10 +8,10 @@ stages:
     dependsOn: []
     pool:
       type: windows
-      isCustom: true
-      name: 'ProjectReunionESPool-2022' # This stage is purely for validation
-      # If we just let the pool give us MMS2022, we will get an error saying an artifact for 1ESPT is missing
-      demands: ImageOverride -equals MMS2022-1ES-GPT      
+      # isCustom: true
+      # name: 'ProjectReunionESPool-2022' # This stage is purely for validation
+      # # If we just let the pool give us MMS2022, we will get an error saying an artifact for 1ESPT is missing
+      # demands: ImageOverride -equals MMS2022-1ES-GPT      
     strategy:
       maxParallel: 10
       matrix:
diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Steps.yml
index 76ba2563a0..509ca2a468 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Steps.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Steps.yml
@@ -54,7 +54,7 @@ steps:
       artifactName: 'WindowsAppSDK_Nuget_And_MSIX'
       targetPath: '$(System.ArtifactsDirectory)'
       source: 'specific'
-      project: $(System.TeamProjectId)
+      project: 55e8140e-57ac-4e5f-8f9c-c7c15b51929d # TODO: replace with $(System.TeamProjectId) once we can have a full WinAppSDK Build on the new mono repo
       pipeline: $(OfficialPipelineID) 
       pipelineId: $(LatestOfficialBuildID) 
     condition: and(succeeded(), ne(variables.SkipInstallerBuild, true))
diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Stage.yml
index 2d1bc008a5..f8376b0480 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Stage.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Stage.yml
@@ -8,10 +8,10 @@ stages:
     dependsOn: []
     pool:
       type: windows
-      isCustom: true
-      name: 'ProjectReunionESPool-2022' # This stage is purely for validation
-      # If we just let the pool give us MMS2022, we will get an error saying an artifact for 1ESPT is missing
-      demands: ImageOverride -equals MMS2022-1ES-GPT      
+      # isCustom: true
+      # name: 'ProjectReunionESPool-2022' # This stage is purely for validation
+      # # If we just let the pool give us MMS2022, we will get an error saying an artifact for 1ESPT is missing
+      # demands: ImageOverride -equals MMS2022-1ES-GPT      
     variables:
       ob_outputDirectory: '$(REPOROOT)\out'
       ob_artifactBaseName: "VSIX"
diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml
index 2e90d4002d..d64565eb6e 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml
@@ -38,7 +38,7 @@ steps:
       artifactName: 'WindowsAppSDK_Nuget_And_MSIX'
       targetPath: '$(System.ArtifactsDirectory)'
       source: 'specific'
-      project: $(System.TeamProjectId)
+      project: 55e8140e-57ac-4e5f-8f9c-c7c15b51929d # TODO: replace with $(System.TeamProjectId) once we can have a full WinAppSDK Build on the new mono repo
       pipeline: $(OfficialPipelineID) 
       pipelineId: $(LatestOfficialBuildID) 
     
diff --git a/build/WindowsAppSDK-Foundation-DevTest.yml b/build/WindowsAppSDK-Foundation-DevTest.yml
index afcd8fdef1..5ffd87d1d5 100644
--- a/build/WindowsAppSDK-Foundation-DevTest.yml
+++ b/build/WindowsAppSDK-Foundation-DevTest.yml
@@ -72,7 +72,7 @@ resources:
       ref: refs/heads/main
     - repository: WindowsAppSDKSamples
       type: github
-      endpoint: 'GitHub - benkuhn - 2-18'
+      endpoint: 'WinAppSDK-Github'
       name: microsoft/WindowsAppSDK-Samples
       ref: $(SamplesBranch)
 
diff --git a/build/WindowsAppSDK-Foundation-Nightly.yml b/build/WindowsAppSDK-Foundation-Nightly.yml
index 6c270d5bf3..d09329149d 100644
--- a/build/WindowsAppSDK-Foundation-Nightly.yml
+++ b/build/WindowsAppSDK-Foundation-Nightly.yml
@@ -58,6 +58,7 @@ variables:
 - template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
 - template: AzurePipelinesTemplates\WindowsAppSDK-Versions.yml@WindowsAppSDKVersionConfig
 - template: WindowsAppSDK-CommonVariables.yml
+- group: WinAppSDK-Foundation-Build-Variables
 - name: maxParallelForBuildSamplesCompatJob_x64
   value: 20
 - name: maxParallelForBuildSamplesCompatJob_arm64
@@ -79,7 +80,7 @@ resources:
       ref: refs/heads/main
     - repository: WindowsAppSDKSamples
       type: github
-      endpoint: 'GitHub - benkuhn - 2-18'
+      endpoint: 'WinAppSDK-Github'
       name: microsoft/WindowsAppSDK-Samples
       ref: $(SamplesBranch)
 
diff --git a/build/WindowsAppSDK-Foundation-Official.yml b/build/WindowsAppSDK-Foundation-Official.yml
index 89378589fd..31c162e54b 100644
--- a/build/WindowsAppSDK-Foundation-Official.yml
+++ b/build/WindowsAppSDK-Foundation-Official.yml
@@ -62,6 +62,7 @@ variables:
 - template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
 - template: AzurePipelinesTemplates\WindowsAppSDK-Versions.yml@WindowsAppSDKVersionConfig
 - template: WindowsAppSDK-CommonVariables.yml
+- group: WinAppSDK-Foundation-Build-Variables
 - name: maxParallelForBuildSamplesCompatJob_x64
   value: 20
 - name: maxParallelForBuildSamplesCompatJob_arm64
@@ -83,7 +84,7 @@ resources:
       ref: refs/heads/main
     - repository: WindowsAppSDKSamples
       type: github
-      endpoint: 'GitHub - benkuhn - 2-18'
+      endpoint: 'WinAppSDK-Github'
       name: microsoft/WindowsAppSDK-Samples
       ref: $(SamplesBranch)
 
diff --git a/build/WindowsAppSDK-Foundation-PR.yml b/build/WindowsAppSDK-Foundation-PR.yml
index d1df925dbd..c2beedc669 100644
--- a/build/WindowsAppSDK-Foundation-PR.yml
+++ b/build/WindowsAppSDK-Foundation-PR.yml
@@ -41,6 +41,7 @@ variables:
 - template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
 - template: AzurePipelinesTemplates\WindowsAppSDK-Versions.yml@WindowsAppSDKVersionConfig
 - template: WindowsAppSDK-CommonVariables.yml
+- group: WinAppSDK-Foundation-Build-Variables
 - name: maxParallelForBuildSamplesCompatJob_x64
   value: 20
 - name: maxParallelForBuildSamplesCompatJob_arm64
@@ -62,7 +63,7 @@ resources:
       ref: refs/heads/main
     - repository: WindowsAppSDKSamples
       type: github
-      endpoint: 'GitHub - benkuhn - 2-18'
+      endpoint: 'WinAppSDK-Github'
       name: microsoft/WindowsAppSDK-Samples
       ref: $(SamplesBranch)