diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1fd2a48c93..f303db9137 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -165,11 +165,11 @@ jobs:
     clean: all
   strategy:
     matrix:
-      Ubuntu_18_04:
-        vmImage: ubuntu-18.04
+      Ubuntu_22_04:
+        vmImage: ubuntu-22.04
         pwsh: true
-      macOS_10_15_Catalina:
-        vmImage: macOS-10.15
+      macOS_11:
+        vmImage: macOS-11
         pwsh: true
   pool:
     vmImage: $[ variables['vmImage'] ]