diff --git a/.azure-pipelines/powershell-core.yml b/.azure-pipelines/powershell-core.yml
index 68ee2bf9b02a..01873495c95e 100644
--- a/.azure-pipelines/powershell-core.yml
+++ b/.azure-pipelines/powershell-core.yml
@@ -1,6 +1,6 @@
 variables:
   WindowsName: windows
-  WindowsImage: vs2017-win2016
+  WindowsImage: windows-2019
   LinuxName: linux
   LinuxImage: ubuntu-20.04
   MacOSName: macOS
@@ -61,8 +61,8 @@ jobs:
       linux:
         OSName: ${{ variables.LinuxName }}
         ImageName: ${{ variables.LinuxImage }}
-      macOS:	
-        OSName: ${{ variables.MacOSName }}	
+      macOS:
+        OSName: ${{ variables.MacOSName }}
         ImageName: ${{ variables.MacOSImage }}
   pool:
     vmImage: $(ImageName)
@@ -86,8 +86,8 @@ jobs:
       linux:
         OSName: ${{ variables.LinuxName }}
         ImageName: ${{ variables.LinuxImage }}
-      macOS:	
-        OSName: ${{ variables.MacOSName }}	
+      macOS:
+        OSName: ${{ variables.MacOSName }}
         ImageName: ${{ variables.MacOSImage }}
   pool:
     vmImage: $(ImageName)
diff --git a/.azure-pipelines/release-test.yml b/.azure-pipelines/release-test.yml
index 2ff5822b8be4..3a565f01425a 100644
--- a/.azure-pipelines/release-test.yml
+++ b/.azure-pipelines/release-test.yml
@@ -2,61 +2,61 @@ pr: none
 trigger: none
 
 jobs:
-- template: util/smoke-test-steps.yml 
+- template: util/smoke-test-steps.yml
   parameters:
     name: 'Win_PS5_1_14_SmokeTest'
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
     psVersion: '5.1.14'
 
-- template: util/smoke-test-steps.yml 
+- template: util/smoke-test-steps.yml
   parameters:
     name: 'Win_PS6_2_4_SmokeTest'
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
     psVersion: '6.2.4'
 
-- template: util/smoke-test-steps.yml 
+- template: util/smoke-test-steps.yml
   parameters:
     name: 'Win_PS7_0_3_SmokeTest'
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
     psVersion: '7.0.3'
 
-- template: util/smoke-test-steps.yml 
+- template: util/smoke-test-steps.yml
   parameters:
     name: 'Win_Latest_PS_SmokeTest'
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
     psVersion: 'latest'
 
-- template: util/smoke-test-steps.yml 
+- template: util/smoke-test-steps.yml
   parameters:
     name: 'Linux_PS6_2_4_SmokeTest'
     vmImage: 'ubuntu-18.04'
     psVersion: '6.2.4'
 
-- template: util/smoke-test-steps.yml 
+- template: util/smoke-test-steps.yml
   parameters:
     name: 'Linux_PS7_0_3_SmokeTest'
     vmImage: 'ubuntu-18.04'
     psVersion: '7.0.3'
 
-- template: util/smoke-test-steps.yml 
+- template: util/smoke-test-steps.yml
   parameters:
     name: 'Linux_Latest_PS_SmokeTest'
     vmImage: 'ubuntu-18.04'
     psVersion: 'latest'
-    
-- template: util/smoke-test-steps.yml 
+
+- template: util/smoke-test-steps.yml
   parameters:
     name: 'MacOS_PS6_2_4_SmokeTest'
     vmImage: 'macOS-10.15'
     psVersion: '6.2.4'
 
-- template: util/smoke-test-steps.yml 
+- template: util/smoke-test-steps.yml
   parameters:
     name: 'MacOS_PS7_0_3_SmokeTest'
     vmImage: 'macOS-10.15'
     psVersion: '7.0.3'
 
-- template: util/smoke-test-steps.yml 
+- template: util/smoke-test-steps.yml
   parameters:
     name: 'MacOS_Latest_PS_SmokeTest'
     vmImage: 'macOS-10.15'
diff --git a/.azure-pipelines/windows-powershell.yml b/.azure-pipelines/windows-powershell.yml
index e19e22001d3f..af638fe13ca3 100644
--- a/.azure-pipelines/windows-powershell.yml
+++ b/.azure-pipelines/windows-powershell.yml
@@ -1,6 +1,6 @@
 variables:
   WindowsName: windows
-  WindowsImage: VS2017-Win2016
+  WindowsImage: windows-2019
   TestFramework: netcoreapp2.1
   TestTarget: Test
   Configuration: Debug