diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1cbd607c..4b5dd06a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -359,7 +359,7 @@ jobs:
       - name: Check CMake 3.16
         uses: ./.github/actions/quick_cmake
         with:
-          cmake-version: "3.16"
+          cmake-version: "3.16.2"
         if: success() || failure()
 
   cmake-config-ubuntu-2404:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8fdb6a01..598d9362 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -51,17 +51,13 @@ jobs:
         Linux14PC:
           vmImage: "ubuntu-latest"
           cli11.precompile: ON
-        macOS-15_23:
+        macOS-15_20:
           vmImage: "macOS-15"
-          cli11.std: 23
-          cli11.options: -DCLI11_ENABLE_EXTRA_VALIDATORS=1
-        macOS-14_20:
-          vmImage: "macOS-14"
           cli11.std: 20
           cli11.options: -DCLI11_ENABLE_EXTRA_VALIDATORS=1
-        macOS-13_17:
-          vmImage: "macOS-13"
-          cli11.std: 17
+        macOS-latest_23:
+          vmImage: "macos-latest"
+          cli11.std: 23
           cli11.options: -DCLI11_ENABLE_EXTRA_VALIDATORS=1
         macOS-14_11:
           vmImage: "macOS-14"