diff --git a/.azure-pipelines/jobs/package.yml b/.azure-pipelines/jobs/package.yml
index 7bebbb5d4b6..9b64ad1b8fc 100644
--- a/.azure-pipelines/jobs/package.yml
+++ b/.azure-pipelines/jobs/package.yml
@@ -1,12 +1,11 @@
 parameters:
-  vmImage:
+  pool:
 
 jobs:
 - job: Package
   dependsOn:
     - Test
-  pool:
-    vmImage: ${{ parameters.vmImage }}
+  pool: ${{ parameters.pool }}
 
   steps:
   - task: UsePythonVersion@0
diff --git a/.azure-pipelines/jobs/test-windows.yml b/.azure-pipelines/jobs/test-windows.yml
index 74f4df921e4..0dc32276804 100644
--- a/.azure-pipelines/jobs/test-windows.yml
+++ b/.azure-pipelines/jobs/test-windows.yml
@@ -1,12 +1,11 @@
 parameters:
-  vmImage:
+  pool:
 
 jobs:
 - job: Test
   displayName: Test Primary
 
-  pool:
-    vmImage: ${{ parameters.vmImage }}
+  pool: ${{ parameters.pool }}
   strategy:
     matrix:
       Python27:
@@ -28,8 +27,7 @@ jobs:
   # Run after Test_Primary so we don't devour time and jobs if tests are going to fail
   dependsOn: Test
 
-  pool:
-    vmImage: ${{ parameters.vmImage }}
+  pool: ${{ parameters.pool }}
   strategy:
     matrix:
       Python34:
diff --git a/.azure-pipelines/jobs/test.yml b/.azure-pipelines/jobs/test.yml
index bb113a3b5d4..a0151989c0b 100644
--- a/.azure-pipelines/jobs/test.yml
+++ b/.azure-pipelines/jobs/test.yml
@@ -1,12 +1,11 @@
 parameters:
-  vmImage:
+  pool:
 
 jobs:
 - job: Test
   displayName: Test
 
-  pool:
-    vmImage: ${{ parameters.vmImage }}
+  pool: ${{ parameters.pool }}
   strategy:
     matrix:
       Python27:
diff --git a/.azure-pipelines/linux-preview.yml b/.azure-pipelines/linux-preview.yml
index d7749b95bb6..d206dd972cd 100644
--- a/.azure-pipelines/linux-preview.yml
+++ b/.azure-pipelines/linux-preview.yml
@@ -1,8 +1,8 @@
 jobs:
 - template: jobs/test.yml
   parameters:
-    vmImage: Hosted Linux Preview
+    pool: Hosted Linux Preview
 
 - template: jobs/package.yml
   parameters:
-    vmImage: Hosted Linux Preview
+    pool: Hosted Linux Preview
diff --git a/.azure-pipelines/macos-preview.yml b/.azure-pipelines/macos-preview.yml
index d0162d2659b..b0b429adb1b 100644
--- a/.azure-pipelines/macos-preview.yml
+++ b/.azure-pipelines/macos-preview.yml
@@ -1,8 +1,8 @@
 jobs:
 - template: jobs/test.yml
   parameters:
-    vmImage: Hosted macOS Preview
+    pool: Hosted macOS Preview
 
 - template: jobs/package.yml
   parameters:
-    vmImage: Hosted macOS Preview
+    pool: Hosted macOS Preview
diff --git a/.azure-pipelines/macos.yml b/.azure-pipelines/macos.yml
index 90627172f0c..c89e7d33050 100644
--- a/.azure-pipelines/macos.yml
+++ b/.azure-pipelines/macos.yml
@@ -1,8 +1,8 @@
 jobs:
 - template: jobs/test.yml
   parameters:
-    vmImage: Hosted Mac Internal
+    pool: Hosted Mac Internal
 
 - template: jobs/package.yml
   parameters:
-    vmImage: Hosted Mac Internal
+    pool: Hosted Mac Internal
diff --git a/.azure-pipelines/ubuntu-16.04.yml b/.azure-pipelines/ubuntu-16.04.yml
index 6965a15fc6d..347919ac397 100644
--- a/.azure-pipelines/ubuntu-16.04.yml
+++ b/.azure-pipelines/ubuntu-16.04.yml
@@ -1,8 +1,8 @@
 jobs:
 - template: jobs/test.yml
   parameters:
-    vmImage: ubuntu-16.04
+    pool: { vmImage: ubuntu-16.04 }
 
 - template: jobs/package.yml
   parameters:
-    vmImage: ubuntu-16.04
+    pool: { vmImage: ubuntu-16.04 }
diff --git a/.azure-pipelines/vs2017.yml b/.azure-pipelines/vs2017.yml
index bdd4d30154e..c1a71a4e164 100644
--- a/.azure-pipelines/vs2017.yml
+++ b/.azure-pipelines/vs2017.yml
@@ -1,8 +1,8 @@
 jobs:
 - template: jobs/test-windows.yml
   parameters:
-    vmImage: vs2017-win2017
+    pool: { vmImage: vs2017-win2017 }
 
 - template: jobs/package.yml
   parameters:
-    vmImage: vs2017-win2017
+    pool: { vmImage: vs2017-win2017 }