diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml
index dd20feeb8..d1bdd9a50 100644
--- a/.azure-pipelines-ci/ci.yaml
+++ b/.azure-pipelines-ci/ci.yaml
@@ -28,10 +28,10 @@ stages:
               vmImage: ubuntu-20.04
             mac_Latest:
               vmImage: macOS-latest
-            Windows_Server2016_PowerShell_Core:
-              vmImage: vs2017-win2016
             Windows_Server2019_PowerShell_Core:
               vmImage: windows-2019
+            Windows_Server2022_PowerShell_Core:
+              vmImage: windows-2022
         pool:
           vmImage: $[ variables['vmImage'] ]
         steps:
@@ -39,12 +39,12 @@ stages:
       - job:
         strategy:
           matrix:
-            Windows_Server2016_PowerShell_5_1:
-              vmImage: vs2017-win2016
-              pwsh: false
-            Windows_Server2019_PowerShell_5_1:
+            Windows_Server2019_PowerShell_Core:
               vmImage: windows-2019
               pwsh: false
+            Windows_Server2022_PowerShell_Core:
+              vmImage: windows-2022
+              pwsh: false
         pool:
           vmImage: $[ variables['vmImage'] ]
         steps: