diff --git a/build/aro/webapp-build-artifacts.yml b/build/aro/webapp-build-artifacts.yml
index a6ed7947a..0afad4c44 100644
--- a/build/aro/webapp-build-artifacts.yml
+++ b/build/aro/webapp-build-artifacts.yml
@@ -3,7 +3,7 @@ parameters:
 jobs:
 - job: Restore_Build_Publish_Job
   pool: 
-    name: 'Hosted Ubuntu 1604'
+    vmImage: 'ubuntu-16.04'
   steps:
   - task: UseDotNet@2
     displayName: 'Use .NET Core 3.1 SDK'
diff --git a/build/aro/webapp-container-build.yml b/build/aro/webapp-container-build.yml
index f2db6b833..c3e8979bc 100644
--- a/build/aro/webapp-container-build.yml
+++ b/build/aro/webapp-container-build.yml
@@ -5,7 +5,7 @@ parameters:
 jobs:
 - job: Container_Build
   pool: 
-    name: 'Hosted Ubuntu 1604'
+    vmImage: 'windows-latest'
   steps:
   - task: redhat.openshift-vsts.oc-setup-task.oc-setup@2
     displayName: 'oc-setup '