diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ab4cf77f8..5afb39800 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,7 +21,7 @@ jobs:
 - job: "LinuxPythonDebug"
   displayName: "Ubuntu build - python make - debug"
   pool:
-    vmImage: "Ubuntu-16.04"
+    vmImage: "Ubuntu-latest"
   strategy:
     matrix:
       MT:
@@ -70,7 +70,7 @@ jobs:
   displayName: "Ubuntu build - cmake"
   condition: eq(0,1) 
   pool:
-    vmImage: "Ubuntu-16.04"
+    vmImage: "Ubuntu-latest"
   strategy:
     matrix:
       msanClang:
@@ -103,7 +103,7 @@ jobs:
 - job: "Ubuntu16CMake"
   displayName: "Ubuntu build - cmake"
   pool:
-    vmImage: "Ubuntu-16.04"
+    vmImage: "Ubuntu-latest"
   strategy:
     matrix:
       releaseClang:
diff --git a/scripts/build-win-signed.yml b/scripts/build-win-signed.yml
index 1a4a43b3f..9e6ab531c 100644
--- a/scripts/build-win-signed.yml
+++ b/scripts/build-win-signed.yml
@@ -6,7 +6,7 @@ jobs:
 - job: WindowsBuild${{parameters.BuildArchitecture}}
   displayName: "Windows build (${{parameters.BuildArchitecture}})"
   pool:
-    vmImage: "vs2017-win2016"
+    vmImage: "windows-latest"
   steps:
   - powershell: write-host $(System.TeamProjectId)
     displayName: 'System.TeamProjectId'
@@ -18,7 +18,7 @@ jobs:
     displayName: Build
     inputs:
       script:
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{parameters.BuildArchitecture}} &&
+        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{parameters.BuildArchitecture}} &&
         python scripts\mk_win_dist.py
             --${{parameters.BuildArchitecture}}-only
             --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk