diff --git a/eng/pipelines/pre-publish.yml b/eng/pipelines/pre-publish.yml
index aa64b49f2d14..f6f4b856131c 100644
--- a/eng/pipelines/pre-publish.yml
+++ b/eng/pipelines/pre-publish.yml
@@ -20,7 +20,7 @@ stages:
 
           pool:
             name: NetCore1ESPool-Svc-Internal
-            demands: ImageOverride -equals Windows.10.vs2019.amd64
+            demands: ImageOverride -equals windows.vs2017.amd64
 
           workspace:
             clean: all
diff --git a/eng/pipelines/windows.yml b/eng/pipelines/windows.yml
index b8fc2b1f4d39..24435af5f486 100644
--- a/eng/pipelines/windows.yml
+++ b/eng/pipelines/windows.yml
@@ -109,10 +109,10 @@ stages:
         pool:
           ${{ if ne(variables['System.TeamProject'], 'public') }}:
             name: NetCore1ESPool-Svc-Internal
-            demands: ImageOverride -equals Windows.10.vs2019.amd64
+            demands: ImageOverride -equals windows.vs2017.amd64
           ${{ if eq(variables['System.TeamProject'], 'public') }}:
             name: NetCore-Svc-Public
-            demands: ImageOverride -equals Windows.10.vs2019.amd64.Open
+            demands: ImageOverride -equals windows.vs2017.amd64.Open
 
         submitToHelix: true
         # Temporarily until we increase the Windows ARM64 queue, https://github.com/dotnet/core-eng/issues/7756
@@ -166,10 +166,10 @@ stages:
           pool:
             ${{ if ne(variables['System.TeamProject'], 'public') }}:
               name: NetCore1ESPool-Svc-Internal
-              demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017
+              demands: ImageOverride -equals windows.vs2017.amd64
             ${{ if eq(variables['System.TeamProject'], 'public') }}:
               name: NetCore-Svc-Public
-              demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017.Open
+              demands: ImageOverride -equals windows.vs2017.amd64.Open
 
           submitToHelix: true
           buildExtraArguments: /p:RuntimeOS=win10
@@ -216,10 +216,10 @@ stages:
             pool:
               ${{ if ne(variables['System.TeamProject'], 'public') }}:
                 name: NetCore1ESPool-Svc-Internal
-                demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017
+                demands: ImageOverride -equals windows.vs2017.amd64
               ${{ if eq(variables['System.TeamProject'], 'public') }}:
                 name: NetCore-Svc-Public
-                demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017.Open
+                demands: ImageOverride -equals windows.vs2017.amd64.Open
 
             submitToHelix: false
             buildExtraArguments: /p:RuntimeOS=win10