diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 7b80d9b..9464288 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -189,12 +189,12 @@ stages:
               test: macos/12.0
             - name: RHEL 7.9
               test: rhel/7.9
-            - name: RHEL 8.6
-              test: rhel/8.6
+            - name: RHEL 8.5
+              test: rhel/8.5
             - name: FreeBSD 12.3
               test: freebsd/12.3
-            - name: FreeBSD 13.1
-              test: freebsd/13.1
+            - name: FreeBSD 13.0
+              test: freebsd/13.0
   - stage: Remote_2_12
     displayName: Remote 2.12
     dependsOn: []
@@ -207,12 +207,12 @@ stages:
               test: macos/11.1
             - name: RHEL 7.9
               test: rhel/7.9
-            - name: RHEL 8.6
-              test: rhel/8.6
-            - name: FreeBSD 12.3
-              test: freebsd/12.3
-            - name: FreeBSD 13.1
-              test: freebsd/13.1
+            - name: RHEL 8.4
+              test: rhel/8.4
+            - name: FreeBSD 12.2
+              test: freebsd/12.2
+            - name: FreeBSD 13.0
+              test: freebsd/13.0
   - stage: Remote_2_11
     displayName: Remote 2.11
     dependsOn: []
@@ -225,12 +225,12 @@ stages:
               test: macos/11.1
             - name: RHEL 7.9
               test: rhel/7.9
-            - name: RHEL 8.6
-              test: rhel/8.6
+            - name: RHEL 8.3
+              test: rhel/8.3
             - name: FreeBSD 11.4
               test: freebsd/11.4
-            - name: FreeBSD 12.3
-              test: freebsd/12.3
+            - name: FreeBSD 12.2
+              test: freebsd/12.2
   - stage: Remote_2_9
     displayName: Remote 2.9
     dependsOn: []
@@ -243,12 +243,12 @@ stages:
               test: osx/10.11
             - name: RHEL 7.9
               test: rhel/7.9
-            - name: RHEL 8.6
-              test: rhel/8.6
-            - name: FreeBSD 11.4
-              test: freebsd/11.4
-            - name: FreeBSD 12.3
-              test: freebsd/12.3
+            - name: RHEL 8.1
+              test: rhel/8.1
+            - name: FreeBSD 11.1
+              test: freebsd/11.1
+            - name: FreeBSD 12.0
+              test: freebsd/12.0
 
 ## Finally