diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 4f22d28b9..a4a05a95f 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -109,18 +109,18 @@ stages:
         parameters:
           testFormat: devel/linux/{0}
           targets:
-            - name: Fedora 39
-              test: fedora39
-            - name: Ubuntu 20.04
-              test: ubuntu2004
+            - name: Fedora 40
+              test: fedora40
             - name: Ubuntu 22.04
               test: ubuntu2204
-            - name: Alpine 3.19
-              test: alpine319
+            - name: Ubuntu 24.04
+              test: ubuntu2404
+            - name: Alpine 3.20
+              test: alpine320
           groups:
             - 4
             - 5
-            - 6
+            # - 6  -- some images no longer work with docker-compose v1
   - stage: Docker_2_17
     displayName: Docker 2.17
     dependsOn: []
@@ -129,6 +129,10 @@ stages:
         parameters:
           testFormat: 2.17/linux/{0}
           targets:
+            - name: Fedora 39
+              test: fedora39
+            - name: Ubuntu 20.04
+              test: ubuntu2004
             - name: Alpine 3.19
               test: alpine319
           groups:
@@ -201,11 +205,8 @@ stages:
         parameters:
           testFormat: devel/{0}
           targets:
-            - name: RHEL 9.3 with latest Docker SDK from PyPi
-              test: rhel/9.3-pypi-latest
-            # Currently always hangs in group 2
-            # - name: RHEL 8.8
-            #   test: rhel/8.8
+            - name: RHEL 9.4 with latest Docker SDK from PyPi
+              test: rhel/9.4-pypi-latest
           groups:
             - 1
             - 2
@@ -223,9 +224,6 @@ stages:
           targets:
             - name: RHEL 9.3 with latest Docker SDK from PyPi
               test: rhel/9.3-pypi-latest
-            # Currently always hangs in group 2
-            # - name: RHEL 8.8
-            #   test: rhel/8.8
           groups:
             - 1
             - 2
@@ -243,6 +241,9 @@ stages:
           targets:
             - name: RHEL 9.2
               test: rhel/9.2
+            # Currently always hangs in group 2
+            # - name: RHEL 8.8
+            #   test: rhel/8.8
           groups:
             - 1
             - 2