diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index c58b6dc9..1f385756 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -34,14 +34,14 @@
 
 # Run CI against all pushes (direct commits, also merged PRs), Pull Requests
 trigger:
-  batch: true
+  batch: "true"
   branches:
     include:
       - main
       - stable-*
 
 pr:
-  autoCancel: true
+  autoCancel: "true"
   branches:
     include:
       - main
@@ -54,7 +54,7 @@ schedules:
   # version
   - cron: 0 6 * * *
     displayName: Nightly
-    always: true
+    always: "true"
     branches:
       include:
         - main
@@ -70,7 +70,7 @@ variables:
   - name: entryPoint
     value: tests/utils/shippable/shippable.sh
   - name: fetchDepth
-    value: 0
+    value: "0"
 
 resources:
   containers:
@@ -121,6 +121,19 @@ stages:
               test: units
             - name: Lint
               test: lint
+  - stage: Sanity_2_16
+    displayName: Ansible 2.16 sanity
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: "{0}"
+          testFormat: "2.16/{0}"
+          targets:
+            - name: Sanity
+              test: sanity
+            - name: Units
+              test: units
   - stage: Sanity_2_15
     displayName: Ansible 2.15 sanity
     dependsOn: []
@@ -134,33 +147,6 @@ stages:
               test: sanity
             - name: Units
               test: units
-  # - stage: Sanity_2_14
-  #   displayName: Ansible 2.14 sanity
-  #   dependsOn: []
-  #   jobs:
-  #     - template: templates/matrix.yml
-  #       parameters:
-  #         nameFormat: "{0}"
-  #         testFormat: "2.14/{0}"
-  #         targets:
-  #           - name: Sanity
-  #             test: sanity
-  #           - name: Units
-  #             test: units
-  # - stage: Sanity_2_13
-  #   displayName: Ansible 2.13 sanity
-  #   dependsOn: []
-  #   jobs:
-  #     - template: templates/matrix.yml
-  #       parameters:
-  #         nameFormat: "{0}"
-  #         testFormat: "2.13/{0}"
-  #         targets:
-  #           - name: Sanity
-  #             test: sanity
-  #           - name: Units
-  #             test: units
-
   ## Remote tests
   # Integration tests (RECOMMENDED)
   #
@@ -381,18 +367,18 @@ stages:
             - 19
 
   # https://github.com/ansible/ansible/blob/stable-2.15/test/lib/ansible_test/_data/completion/remote.txt
-  - stage: Remote_2_15
-    displayName: Remote 2.15
+  - stage: Remote_2_16
+    displayName: Remote 2.16
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.15/{0}
+          testFormat: 2.16/{0}
           targets:
-            - name: RHEL 9.1
-              test: rhel/9.1/
-            - name: RHEL 8.7
-              test: rhel/8.7/
+            - name: RHEL 9.2
+              test: rhel/9.2/
+            - name: RHEL 8.8
+              test: rhel/8.8/
           groups:
             - 1
       # FIXME - ami is currently broken in CI
@@ -408,7 +394,7 @@ stages:
       #       - 2
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.15/{0}
+          testFormat: 2.16/{0}
           targets:
             - name: fedora 38 container
               test: fedora/38/
@@ -416,22 +402,22 @@ stages:
             - 3
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.15/{0}
+          testFormat: 2.16/{0}
           targets:
-            - name: RHEL 9.1 edge-commit
-              test: rhel/9.1/
-            - name: RHEL 8.7 edge-commit
-              test: rhel/8.7/
+            - name: RHEL 9.2 edge-commit
+              test: rhel/9.2/
+            - name: RHEL 8.8 edge-commit
+              test: rhel/8.8/
           groups:
             - 4
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.15/{0}
+          testFormat: 2.16/{0}
           targets:
-            - name: RHEL 9.1 edge-container
-              test: rhel/9.1/
-            - name: RHEL 8.7 edge-container
-              test: rhel/8.7/
+            - name: RHEL 9.2 edge-container
+              test: rhel/9.2/
+            - name: RHEL 8.8 edge-container
+              test: rhel/8.8/
           groups:
             - 5
 
@@ -485,18 +471,18 @@ stages:
 
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.15/{0}
+          testFormat: 2.16/{0}
           targets:
-            - name: fedora 37 iot-commit
-              test: fedora/37/
+            - name: fedora 38 iot-commit
+              test: fedora/38/
           groups:
             - 10
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.15/{0}
+          testFormat: 2.16/{0}
           targets:
-            - name: fedora 37 iot-container
-              test: fedora/37/
+            - name: fedora 38 iot-container
+              test: fedora/38/
           groups:
             - 11
 
@@ -521,78 +507,78 @@ stages:
       #       - 13
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.15/{0}
+          testFormat: 2.16/{0}
           targets:
-            - name: RHEL 9.1 oci
-              test: rhel/9.1/
-            - name: RHEL 8.7 oci
-              test: rhel/8.7/
+            - name: RHEL 9.2 oci
+              test: rhel/9.2/
+            - name: RHEL 8.8 oci
+              test: rhel/8.8/
           groups:
             - 14
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.15/{0}
+          testFormat: 2.16/{0}
           targets:
-            - name: RHEL 9.1 openstack
-              test: rhel/9.1/
-            - name: RHEL 8.7 openstack
-              test: rhel/8.7/
+            - name: RHEL 9.2 openstack
+              test: rhel/9.2/
+            - name: RHEL 8.8 openstack
+              test: rhel/8.8/
           groups:
             - 15
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.15/{0}
+          testFormat: 2.16/{0}
           targets:
-            - name: RHEL 9.1 qcow2
-              test: rhel/9.1/
-            - name: RHEL 8.7 qcow2
-              test: rhel/8.7/
+            - name: RHEL 9.2 qcow2
+              test: rhel/9.2/
+            - name: RHEL 8.8 qcow2
+              test: rhel/8.8/
           groups:
             - 16
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.15/{0}
+          testFormat: 2.16/{0}
           targets:
-            - name: RHEL 9.1 tar
-              test: rhel/9.1/
-            - name: RHEL 8.7 tar
-              test: rhel/8.7/
+            - name: RHEL 9.2 tar
+              test: rhel/9.2/
+            - name: RHEL 8.8 tar
+              test: rhel/8.8/
           groups:
             - 17
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.15/{0}
+          testFormat: 2.16/{0}
           targets:
-            - name: RHEL 9.1 vhd
-              test: rhel/9.1/
-            - name: RHEL 8.7 vhd
-              test: rhel/8.7/
+            - name: RHEL 9.2 vhd
+              test: rhel/9.2/
+            - name: RHEL 8.8 vhd
+              test: rhel/8.8/
           groups:
             - 18
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.15/{0}
+          testFormat: 2.16/{0}
           targets:
-            - name: RHEL 9.1 vmdk
-              test: rhel/9.1/
-            - name: RHEL 8.7 vmdk
-              test: rhel/8.7/
+            - name: RHEL 9.2 vmdk
+              test: rhel/9.2/
+            - name: RHEL 8.8 vmdk
+              test: rhel/8.8/
           groups:
             - 19
 
   # https://github.com/ansible/ansible/blob/stable-2.14/test/lib/ansible_test/_data/completion/remote.txt
-  - stage: Remote_2_14
-    displayName: Remote 2.14
+  - stage: Remote_2_15
+    displayName: Remote 2.15
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/{0}
+          testFormat: 2.15/{0}
           targets:
-            - name: RHEL 9.0
-              test: rhel/9.0/
-            - name: RHEL 8.6
-              test: rhel/8.6/
+            - name: RHEL 9.1
+              test: rhel/9.1/
+            - name: RHEL 8.7
+              test: rhel/8.7/
           groups:
             - 1
       # FIXME - ami is currently broken in CI
@@ -608,30 +594,30 @@ stages:
       #       - 2
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/{0}
+          testFormat: 2.15/{0}
           targets:
-            - name: Fedora 36 container
-              test: fedora/36/
+            - name: Fedora 37 container
+              test: fedora/37/
           groups:
             - 3
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/{0}
+          testFormat: 2.15/{0}
           targets:
-            - name: RHEL 9.0 edge-commit
-              test: rhel/9.0/
-            - name: RHEL 8.6 edge-commit
-              test: rhel/8.6/
+            - name: RHEL 9.1 edge-commit
+              test: rhel/9.1/
+            - name: RHEL 8.7 edge-commit
+              test: rhel/8.7/
           groups:
             - 4
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/{0}
+          testFormat: 2.15/{0}
           targets:
-            - name: RHEL 9.0 edge-container
-              test: rhel/9.0/
-            - name: RHEL 8.6 edge-container
-              test: rhel/8.6/
+            - name: RHEL 9.1 edge-container
+              test: rhel/9.1/
+            - name: RHEL 8.7 edge-container
+              test: rhel/8.7/
           groups:
             - 5
 
@@ -685,18 +671,18 @@ stages:
 
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/{0}
+          testFormat: 2.15/{0}
           targets:
-            - name: Fedora 36 iot-commit
-              test: fedora/36/
+            - name: Fedora 37 iot-commit
+              test: fedora/37/
           groups:
             - 10
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/{0}
+          testFormat: 2.15/{0}
           targets:
-            - name: Fedora 36 iot-container
-              test: fedora/36/
+            - name: Fedora 37 iot-container
+              test: fedora/37/
           groups:
             - 11
 
@@ -721,216 +707,216 @@ stages:
       #       - 13
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/{0}
+          testFormat: 2.15/{0}
           targets:
-            - name: RHEL 9.0 oci
-              test: rhel/9.0/
-            - name: RHEL 8.6 oci
-              test: rhel/8.6/
+            - name: RHEL 9.1 oci
+              test: rhel/9.1/
+            - name: RHEL 8.7 oci
+              test: rhel/8.7/
           groups:
             - 14
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/{0}
+          testFormat: 2.15/{0}
           targets:
-            - name: RHEL 9.0 openstack
-              test: rhel/9.0/
-            - name: RHEL 8.6 openstack
-              test: rhel/8.6/
+            - name: RHEL 9.1 openstack
+              test: rhel/9.1/
+            - name: RHEL 8.7 openstack
+              test: rhel/8.7/
           groups:
             - 15
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/{0}
+          testFormat: 2.15/{0}
           targets:
-            - name: RHEL 9.0 qcow2
-              test: rhel/9.0/
-            - name: RHEL 8.6 qcow2
-              test: rhel/8.6/
+            - name: RHEL 9.1 qcow2
+              test: rhel/9.1/
+            - name: RHEL 8.7 qcow2
+              test: rhel/8.7/
           groups:
             - 16
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/{0}
+          testFormat: 2.15/{0}
           targets:
-            - name: RHEL 9.0 tar
-              test: rhel/9.0/
-            - name: RHEL 8.6 tar
-              test: rhel/8.6/
+            - name: RHEL 9.1 tar
+              test: rhel/9.1/
+            - name: RHEL 8.7 tar
+              test: rhel/8.7/
           groups:
             - 17
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/{0}
+          testFormat: 2.15/{0}
           targets:
-            - name: RHEL 9.0 vhd
-              test: rhel/9.0/
-            - name: RHEL 8.6 vhd
-              test: rhel/8.6/
+            - name: RHEL 9.1 vhd
+              test: rhel/9.1/
+            - name: RHEL 8.7 vhd
+              test: rhel/8.7/
           groups:
             - 18
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.14/{0}
+          testFormat: 2.15/{0}
           targets:
-            - name: RHEL 9.0 vmdk
-              test: rhel/9.0/
-            - name: RHEL 8.6 vmdk
-              test: rhel/8.6/
+            - name: RHEL 9.1 vmdk
+              test: rhel/9.1/
+            - name: RHEL 8.7 vmdk
+              test: rhel/8.7/
           groups:
             - 19
 
-  # https://github.com/ansible/ansible/blob/stable-2.13/test/lib/ansible_test/_data/completion/remote.txt
-  - stage: Remote_2_13
-    displayName: Remote 2.13
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/{0}
-          targets:
-            - name: RHEL 9.0
-              test: rhel/9.0/
-            - name: RHEL 8.5
-              test: rhel/8.5/
-          groups:
-            - 1
-      # FIXME - ami is currently broken in CI
-      # - template: templates/matrix.yml
-      #   parameters:
-      #     testFormat: 2.13/{0}
-      #     targets:
-      #       - name: RHEL 9.0 ami
-      #         test: rhel/9.0/azure
-      #       - name: RHEL 8.5 ami
-      #         test: rhel/8.5/azure
-      #     groups:
-      #       - 2
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/{0}
-          targets:
-            - name: RHEL 9.0 edge-commit
-              test: rhel/9.0/
-            - name: RHEL 8.5 edge-commit
-              test: rhel/8.5/
-          groups:
-            - 4
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/{0}
-          targets:
-            - name: RHEL 9.0 edge-container
-              test: rhel/9.0/
-            - name: RHEL 8.5 edge-container
-              test: rhel/8.5/
-          groups:
-            - 5
-
-      # Fixme
-      # - template: templates/matrix.yml
-      #   parameters:
-      #     testFormat: 2.13/{0}
-      #     targets:
-      #       - name: RHEL 9.0 edge-installer
-      #         test: rhel/9.0/
-      #       - name: RHEL 8.5 edge-installer
-      #         test: rhel/8.5/
-      #     groups:
-      #       - 6
-
-      # Fixme
-      # - template: templates/matrix.yml
-      #   parameters:
-      #     testFormat: 2.13/{0}
-      #     targets:
-      #       - name: RHEL 9.0 edge-raw-image
-      #         test: rhel/9.0/
-      #     groups:
-      #       - 7
-
-      # comment out because edge-simplified-installer requireds an installation device
-      # - template: templates/matrix.yml
-      #   parameters:
-      #     testFormat: 2.13/{0}
-      #     targets:
-      #       - name: RHEL 9.0 edge-simplified-installer
-      #         test: rhel/9.0/
-      #     groups:
-      #       - 8
-
-      # Fixme
-      # - template: templates/matrix.yml
-      #   parameters:
-      #     testFormat: 2.13/{0}
-      #     targets:
-      #       - name: RHEL 9.0 image-installer
-      #         test: rhel/9.0/
-      #       - name: RHEL 8.5 image-installer
-      #         test: rhel/8.5/
-      #     groups:
-      #       - 9
+  # # https://github.com/ansible/ansible/blob/stable-2.13/test/lib/ansible_test/_data/completion/remote.txt
+  # - stage: Remote_2_13
+  #   displayName: Remote 2.13
+  #   dependsOn: []
+  #   jobs:
+  #     - template: templates/matrix.yml
+  #       parameters:
+  #         testFormat: 2.13/{0}
+  #         targets:
+  #           - name: RHEL 9.0
+  #             test: rhel/9.0/
+  #           - name: RHEL 8.5
+  #             test: rhel/8.5/
+  #         groups:
+  #           - 1
+  #     # FIXME - ami is currently broken in CI
+  #     # - template: templates/matrix.yml
+  #     #   parameters:
+  #     #     testFormat: 2.13/{0}
+  #     #     targets:
+  #     #       - name: RHEL 9.0 ami
+  #     #         test: rhel/9.0/azure
+  #     #       - name: RHEL 8.5 ami
+  #     #         test: rhel/8.5/azure
+  #     #     groups:
+  #     #       - 2
+  #     - template: templates/matrix.yml
+  #       parameters:
+  #         testFormat: 2.13/{0}
+  #         targets:
+  #           - name: RHEL 9.0 edge-commit
+  #             test: rhel/9.0/
+  #           - name: RHEL 8.5 edge-commit
+  #             test: rhel/8.5/
+  #         groups:
+  #           - 4
+  #     - template: templates/matrix.yml
+  #       parameters:
+  #         testFormat: 2.13/{0}
+  #         targets:
+  #           - name: RHEL 9.0 edge-container
+  #             test: rhel/9.0/
+  #           - name: RHEL 8.5 edge-container
+  #             test: rhel/8.5/
+  #         groups:
+  #           - 5
+
+  #     # Fixme
+  #     # - template: templates/matrix.yml
+  #     #   parameters:
+  #     #     testFormat: 2.13/{0}
+  #     #     targets:
+  #     #       - name: RHEL 9.0 edge-installer
+  #     #         test: rhel/9.0/
+  #     #       - name: RHEL 8.5 edge-installer
+  #     #         test: rhel/8.5/
+  #     #     groups:
+  #     #       - 6
+
+  #     # Fixme
+  #     # - template: templates/matrix.yml
+  #     #   parameters:
+  #     #     testFormat: 2.13/{0}
+  #     #     targets:
+  #     #       - name: RHEL 9.0 edge-raw-image
+  #     #         test: rhel/9.0/
+  #     #     groups:
+  #     #       - 7
+
+  #     # comment out because edge-simplified-installer requireds an installation device
+  #     # - template: templates/matrix.yml
+  #     #   parameters:
+  #     #     testFormat: 2.13/{0}
+  #     #     targets:
+  #     #       - name: RHEL 9.0 edge-simplified-installer
+  #     #         test: rhel/9.0/
+  #     #     groups:
+  #     #       - 8
+
+  #     # Fixme
+  #     # - template: templates/matrix.yml
+  #     #   parameters:
+  #     #     testFormat: 2.13/{0}
+  #     #     targets:
+  #     #       - name: RHEL 9.0 image-installer
+  #     #         test: rhel/9.0/
+  #     #       - name: RHEL 8.5 image-installer
+  #     #         test: rhel/8.5/
+  #     #     groups:
+  #     #       - 9
 
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/{0}
-          targets:
-            - name: RHEL 9.0 oci
-              test: rhel/9.0/
-            - name: RHEL 8.5 oci
-              test: rhel/8.5/
-          groups:
-            - 14
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/{0}
-          targets:
-            - name: RHEL 9.0 openstack
-              test: rhel/9.0/
-            - name: RHEL 8.5 openstack
-              test: rhel/8.5/
-          groups:
-            - 15
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/{0}
-          targets:
-            - name: RHEL 9.0 qcow2
-              test: rhel/9.0/
-            - name: RHEL 8.5 qcow2
-              test: rhel/8.5/
-          groups:
-            - 16
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/{0}
-          targets:
-            - name: RHEL 9.0 tar
-              test: rhel/9.0/
-            - name: RHEL 8.5 tar
-              test: rhel/8.5/
-          groups:
-            - 17
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/{0}
-          targets:
-            - name: RHEL 9.0 vhd
-              test: rhel/9.0/
-            - name: RHEL 8.5 vhd
-              test: rhel/8.5/
-          groups:
-            - 18
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/{0}
-          targets:
-            - name: RHEL 9.0 vmdk
-              test: rhel/9.0/
-            - name: RHEL 8.5 vmdk
-              test: rhel/8.5/
-          groups:
-            - 19
+  #     - template: templates/matrix.yml
+  #       parameters:
+  #         testFormat: 2.13/{0}
+  #         targets:
+  #           - name: RHEL 9.0 oci
+  #             test: rhel/9.0/
+  #           - name: RHEL 8.5 oci
+  #             test: rhel/8.5/
+  #         groups:
+  #           - 14
+  #     - template: templates/matrix.yml
+  #       parameters:
+  #         testFormat: 2.13/{0}
+  #         targets:
+  #           - name: RHEL 9.0 openstack
+  #             test: rhel/9.0/
+  #           - name: RHEL 8.5 openstack
+  #             test: rhel/8.5/
+  #         groups:
+  #           - 15
+  #     - template: templates/matrix.yml
+  #       parameters:
+  #         testFormat: 2.13/{0}
+  #         targets:
+  #           - name: RHEL 9.0 qcow2
+  #             test: rhel/9.0/
+  #           - name: RHEL 8.5 qcow2
+  #             test: rhel/8.5/
+  #         groups:
+  #           - 16
+  #     - template: templates/matrix.yml
+  #       parameters:
+  #         testFormat: 2.13/{0}
+  #         targets:
+  #           - name: RHEL 9.0 tar
+  #             test: rhel/9.0/
+  #           - name: RHEL 8.5 tar
+  #             test: rhel/8.5/
+  #         groups:
+  #           - 17
+  #     - template: templates/matrix.yml
+  #       parameters:
+  #         testFormat: 2.13/{0}
+  #         targets:
+  #           - name: RHEL 9.0 vhd
+  #             test: rhel/9.0/
+  #           - name: RHEL 8.5 vhd
+  #             test: rhel/8.5/
+  #         groups:
+  #           - 18
+  #     - template: templates/matrix.yml
+  #       parameters:
+  #         testFormat: 2.13/{0}
+  #         targets:
+  #           - name: RHEL 9.0 vmdk
+  #             test: rhel/9.0/
+  #           - name: RHEL 8.5 vmdk
+  #             test: rhel/8.5/
+  #         groups:
+  #           - 19
 
   ## Finally
   # This job does nothing and is only used for the branch protection
@@ -940,12 +926,10 @@ stages:
     condition: succeededOrFailed()
     dependsOn:
       - Sanity_devel
+      - Sanity_2_16
       - Sanity_2_15
-      - Sanity_2_14
-      - Sanity_2_13
       - Remote_devel
+      - Remote_2_16
       - Remote_2_15
-      - Remote_2_14
-      - Remote_2_13
     jobs:
       - template: templates/coverage.yml