diff --git a/eng/finalize-publish.yml b/eng/finalize-publish.yml
index cb860ee43b3f..d7b19ac76b86 100644
--- a/eng/finalize-publish.yml
+++ b/eng/finalize-publish.yml
@@ -17,6 +17,6 @@ jobs:
       configuration: Release
       pool:
         name: NetCore1ESPool-Svc-Internal
-        demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017
+        demands: ImageOverride -equals windows.vs2017.amd64
       dependsOn: ${{ parameters.dependsOn }}
       publishUsingPipelines: true
diff --git a/eng/xplat-job.yml b/eng/xplat-job.yml
index 2a7cde4b6705..4dd9551b6d9f 100644
--- a/eng/xplat-job.yml
+++ b/eng/xplat-job.yml
@@ -62,12 +62,12 @@ jobs:
       # Official Build Windows Pool
       ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}:
         name: NetCore1ESPool-Svc-Internal
-        demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017
+        demands: ImageOverride -equals windows.vs2017.amd64
 
       # Public Windows Build Pool
       ${{ if and(eq(parameters.osGroup, 'Windows_NT'), 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
 
     workspace:
       clean: all