diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 44b334b82d86dfc1bd99301f174e47e5fc6dc6b7..dc38c8e68ce5ea647116fe46bff808823b7266d3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -447,7 +447,7 @@ stages:
         - job: MacOS
           condition: eq(1,2)
           pool:
-            vmImage: $(MacOSMachineQueueName)
+            vmImage: macos-11
           variables:
           - name: _SignType
             value: Test
@@ -578,7 +578,7 @@ stages:
         - job: Plain_Build_MacOS
           condition: eq(1,2)
           pool:
-            vmImage: $(MacOSMachineQueueName)
+            vmImage: macos-11
           variables:
           - name: _BuildConfig
             value: Debug
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
index 21fd12276b658078a891929c2fc9028b80548309..9ae196c0bfef04b39c545a57b555f7d8c80cf51b 100644
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@@ -29,7 +29,7 @@ jobs:
     pool:
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
         name: NetCore-Public
-        demands: ImageOverride -equals windows.vs2019.amd64.open
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
       ${{ if eq(variables['System.TeamProject'], 'internal') }}:
         name: NetCore1ESPool-Internal
         demands: ImageOverride -equals windows.vs2019.amd64