diff --git a/build/azure-pipelines/sql-product-build.yml b/build/azure-pipelines/sql-product-build.yml
index c5a7f05628..e11e083c83 100644
--- a/build/azure-pipelines/sql-product-build.yml
+++ b/build/azure-pipelines/sql-product-build.yml
@@ -20,7 +20,7 @@ jobs:
 - job: macOS
   condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'), ne(variables['VSCODE_QUALITY'], 'saw'))
   pool:
-    vmImage: macOS-latest
+    vmImage: 'macOS-10.15'
   dependsOn:
   - Compile
   steps:
@@ -30,7 +30,7 @@ jobs:
 - job: macOS_Signing
   condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'), eq(variables['signed'], true), ne(variables['VSCODE_QUALITY'], 'saw'))
   pool:
-    vmImage: macOS-latest
+    vmImage: 'macOS-10.15'
   dependsOn:
   - macOS
   steps:
@@ -53,7 +53,7 @@ jobs:
 - job: Windows
   condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
   pool:
-    vmImage: VS2017-Win2016
+    vmImage: 'windows-2019'
   dependsOn:
   - Compile
   steps:
diff --git a/build/azure-pipelines/win32/sql-product-build-win32.yml b/build/azure-pipelines/win32/sql-product-build-win32.yml
index 417f22e259..3a7fc4dce7 100644
--- a/build/azure-pipelines/win32/sql-product-build-win32.yml
+++ b/build/azure-pipelines/win32/sql-product-build-win32.yml
@@ -27,7 +27,7 @@ steps:
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { tar --force-local -xzf $(Pipeline.Workspace)/compilation.tar.gz }
+      exec { tar -xf $(Pipeline.Workspace)/compilation.tar.gz }
     displayName: Extract compilation output
 
   - powershell: |