diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e34a3bc5..fde90697 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,14 +9,28 @@ trigger:
 jobs:
 - job: WinBuild
   displayName: Windows Build
-  pool:
-    vmImage: 'vs2017-win2016'
   strategy:
     matrix:
-      Debug:
-        CI_ENV_BUILD_TYPE: Debug
-      Release with Release Installer:
-        CI_ENV_BUILD_TYPE: Release
+#        windows-2022-Debug:
+#            imageName: "windows-2022"
+#            CI_ENV_BUILD_TYPE: Debug
+#        windows-2022-Release:
+#            imageName: "windows-2022"
+#            CI_ENV_BUILD_TYPE: Release
+#        windows-2019-Debug:
+#            imageName: "windows-2019"
+#            CI_ENV_BUILD_TYPE: Debug
+#        windows-2019-Release:
+#            imageName: "windows-2019"
+#            CI_ENV_BUILD_TYPE: Release
+        windows-2016-Debug:
+            CI_ENV_BUILD_TYPE: Debug
+            imageName: "vs2017-win2016"
+        windows-2016-Release:
+            CI_ENV_BUILD_TYPE: Release
+            imageName: "vs2017-win2016"
+  pool:
+    vmImage: $(imageName)
   steps:
     # Gather Dependencies
     - task: PowerShell@2