diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 45548f957..444e43c94 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -42,7 +42,7 @@ variables:
   IsLightBuild: $[eq(variables['Build.Reason'], 'PullRequest')]
   IsCanaryBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/')]
 
-  XCODE_ROOT: '/Applications/Xcode_16.1.app'
+  XCODE_ROOT: '/Applications/Xcode_16.0.app'
 
   # Required to about trashing azdo hosted agents
   AotCompileMaxDegreeOfParallelism: 2
diff --git a/build/templates/xcode-select.yml b/build/templates/xcode-select.yml
index eff69cd16..5bbc04811 100644
--- a/build/templates/xcode-select.yml
+++ b/build/templates/xcode-select.yml
@@ -6,6 +6,6 @@ steps:
       ls -la /Applications
       echo 'Xcode Root to ${{parameters.xCodeRoot}}'
       echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'${{parameters.xCodeRoot}}
-      sudo xcode-select --switch ${{parameters.xCodeRoot}}/Contents/Developer
+      sudo xcode-select -p ${{parameters.xCodeRoot}}
 
     displayName: Select Xcode