diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
index 1236a0e278..6c7a94e021 100644
--- a/.vsts-ci/linux.yml
+++ b/.vsts-ci/linux.yml
@@ -43,14 +43,14 @@ resources:
 jobs:
 - template: templates/ci-build.yml
   parameters:
-    pool: Hosted Ubuntu 1604
+    pool: ubuntu-16.04
     jobName: linux_build
     displayName: linux Build
 
 - template: templates/nix-test.yml
   parameters:
     name: Linux
-    pool: Hosted Ubuntu 1604
+    pool: ubuntu-16.04
     purpose: UnelevatedPesterTests
     tagSet: CI
     parentJobs:
@@ -59,7 +59,7 @@ jobs:
 - template: templates/nix-test.yml
   parameters:
     name: Linux
-    pool: Hosted Ubuntu 1604
+    pool: ubuntu-16.04
     purpose: ElevatedPesterTests
     tagSet: CI
     parentJobs:
@@ -68,7 +68,7 @@ jobs:
 - template: templates/nix-test.yml
   parameters:
     name: Linux
-    pool: Hosted Ubuntu 1604
+    pool: ubuntu-16.04
     purpose: UnelevatedPesterTests
     tagSet: Others
     parentJobs:
@@ -77,7 +77,7 @@ jobs:
 - template: templates/nix-test.yml
   parameters:
     name: Linux
-    pool: Hosted Ubuntu 1604
+    pool: ubuntu-16.04
     purpose: ElevatedPesterTests
     tagSet: Others
     parentJobs:
@@ -85,7 +85,7 @@ jobs:
 
 - template: templates/verify-xunit.yml
   parameters:
-    pool: Hosted Ubuntu 1604
+    pool: ubuntu-16.04
     parentJobs:
       - linux_build
 
diff --git a/.vsts-ci/mac.yml b/.vsts-ci/mac.yml
index b048a248bb..ca4a66fc7e 100644
--- a/.vsts-ci/mac.yml
+++ b/.vsts-ci/mac.yml
@@ -45,7 +45,7 @@ resources:
 jobs:
 - template: templates/ci-build.yml
   parameters:
-    pool: Hosted macOS
+    pool: macOS-latest
     jobName: mac_build
     displayName: macOS Build
 
@@ -79,7 +79,7 @@ jobs:
 
 - template: templates/verify-xunit.yml
   parameters:
-    pool: 'Hosted macOS'
+    pool: macOS-latest
     parentJobs:
       - mac_build
 
diff --git a/.vsts-ci/templates/ci-build.yml b/.vsts-ci/templates/ci-build.yml
index 5b9b3bfd57..026448908f 100644
--- a/.vsts-ci/templates/ci-build.yml
+++ b/.vsts-ci/templates/ci-build.yml
@@ -1,12 +1,12 @@
 parameters:
-  pool: 'Hosted VS2017'
+  pool: 'vs2017-win2016'
   jobName: 'win_build'
   displayName: Windows Build
 
 jobs:
 - job: ${{ parameters.jobName }}
   pool:
-    name: ${{ parameters.pool }}
+    vmImage: ${{ parameters.pool }}
 
   displayName: ${{ parameters.displayName }}
 
diff --git a/.vsts-ci/templates/nanoserver.yml b/.vsts-ci/templates/nanoserver.yml
index 395f67e5e7..d7575836f8 100644
--- a/.vsts-ci/templates/nanoserver.yml
+++ b/.vsts-ci/templates/nanoserver.yml
@@ -1,5 +1,5 @@
 parameters:
-  vmImage: 'win1803'
+  vmImage: 'windows-2019'
   jobName: 'Nanoserver_Tests'
   continueOnError: false
 
diff --git a/.vsts-ci/templates/nix-test.yml b/.vsts-ci/templates/nix-test.yml
index 7af648cf05..0938a93bcf 100644
--- a/.vsts-ci/templates/nix-test.yml
+++ b/.vsts-ci/templates/nix-test.yml
@@ -1,5 +1,5 @@
 parameters:
-  pool: 'Hosted macOS'
+  pool: 'macOS-latest'
   parentJobs: []
   purpose: ''
   tagSet: 'CI'
@@ -10,7 +10,7 @@ jobs:
   dependsOn:
     ${{ parameters.parentJobs }}
   pool:
-    name: ${{ parameters.pool }}
+    vmImage: ${{ parameters.pool }}
 
   displayName: ${{ parameters.name }} Test - ${{ parameters.purpose }} - ${{ parameters.tagSet }}
 
diff --git a/.vsts-ci/templates/verify-xunit.yml b/.vsts-ci/templates/verify-xunit.yml
index 03f89ce30e..9e09584d5c 100644
--- a/.vsts-ci/templates/verify-xunit.yml
+++ b/.vsts-ci/templates/verify-xunit.yml
@@ -1,13 +1,13 @@
 parameters:
   parentJobs: []
-  pool: 'Hosted VS2017'
+  pool: 'vs2017-win2016'
   jobName: 'xunit_verify'
 
 jobs:
 - job: verify_xunit
   displayName: Verify xUnit Results
   pool:
-    name: ${{ parameters.pool }}
+    vmImage: ${{ parameters.pool }}
   dependsOn:
     ${{ parameters.parentJobs }}
   steps:
diff --git a/.vsts-ci/windows-daily.yml b/.vsts-ci/windows-daily.yml
index 7b9408eec7..c05b5735cb 100644
--- a/.vsts-ci/windows-daily.yml
+++ b/.vsts-ci/windows-daily.yml
@@ -70,8 +70,6 @@ stages:
       tagSet: Others
 
   - template: templates/verify-xunit.yml
-    parameters:
-      pool: 'Hosted VS2017'
 
 - stage: PackagingWin
   displayName: Packaging for Windows
diff --git a/.vsts-ci/windows.yml b/.vsts-ci/windows.yml
index 84a9435d04..81e74dcbc7 100644
--- a/.vsts-ci/windows.yml
+++ b/.vsts-ci/windows.yml
@@ -70,10 +70,6 @@ stages:
       tagSet: Others
 
   - template: templates/verify-xunit.yml
-    parameters:
-      pool: 'Hosted VS2017'
-
-  - template: templates/nanoserver.yml
 
 - stage: PackagingWin
   displayName: Packaging for Windows