diff --git a/build/pipelines/templates/build-app-internal.yaml b/build/pipelines/templates/build-app-internal.yaml
index a84c0bcf..b63a3004 100644
--- a/build/pipelines/templates/build-app-internal.yaml
+++ b/build/pipelines/templates/build-app-internal.yaml
@@ -12,11 +12,7 @@ jobs:
   displayName: Build ${{ parameters.platform }}
   condition: ${{ parameters.condition }}
   pool:
-    name: Package ES Custom Demands Lab A
-    demands:
-    - msbuild
-    - visualstudio
-    - ClientAlias -equals PKGESUTILAPPS
+    vmImage: vs2017-win2016
   variables:
     BuildConfiguration: Release
     BuildPlatform: ${{ parameters.platform }}
diff --git a/build/pipelines/templates/build-app-public.yaml b/build/pipelines/templates/build-app-public.yaml
index 87f862f1..78c033ed 100644
--- a/build/pipelines/templates/build-app-public.yaml
+++ b/build/pipelines/templates/build-app-public.yaml
@@ -10,11 +10,7 @@ jobs:
   displayName: Build ${{ parameters.platform }}
   condition: ${{ parameters.condition }}
   pool:
-    name: Package ES Custom Demands Lab A
-    demands:
-    - msbuild
-    - visualstudio
-    - ClientAlias -equals PKGESUTILAPPS
+    vmImage: vs2017-win2016
   variables:
     BuildConfiguration: Release
     BuildPlatform: ${{ parameters.platform }}