diff --git a/infra/azure/nightly.yml b/infra/azure/nightly.yml
index eeed7fa58f..41a448d3b2 100644
--- a/infra/azure/nightly.yml
+++ b/infra/azure/nightly.yml
@@ -16,156 +16,105 @@ stages:
 
 # Fedora
 
-- stage: FedoraLatest_Ansible_Core_2_13
+- stage: fedora-latest_Ansible_Core_2_15
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: fedora-latest
-      ansible_version: "-core >=2.13,<2.14"
-      filter_tests: false
-
-- stage: FedoraLatest_Ansible_Core_2_14
-  dependsOn: []
-  jobs:
-  - template: templates/group_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      distro: fedora-latest
-      ansible_version: "-core >=2.14,<2.15"
+      ansible_version: "-core >=2.15,<2.16"
       filter_tests: false
 
-- stage: FedoraLatest_Ansible_Core_2_15
+- stage: fedora-latest_Ansible_Core_2_16
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: fedora-latest
-      ansible_version: "-core >=2.15,<2.16"
+      ansible_version: "-core >=2.16,<2.17"
       filter_tests: false
 
-- stage: FedoraLatest_Ansible_latest
+- stage: fedora-latest_Ansible_Core_2_17
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: fedora-latest
-      ansible_version: ""
+      ansible_version: "-core >=2.17"
       filter_tests: false
 
 # Galaxy on Fedora
 
-- stage: Galaxy_FedoraLatest_Ansible_Core_2_13
-  dependsOn: []
-  jobs:
-  - template: templates/group_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      distro: fedora-latest
-      ansible_version: "-core >=2.13,<2.14"
-      filter_tests: false
-      test_galaxy: true
-
-- stage: Galaxy_FedoraLatest_Ansible_Core_2_14
+- stage: Galaxy-fedora-latest_Ansible_Core_2_15
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: fedora-latest
-      ansible_version: "-core >=2.14,<2.15"
+      ansible_version: "-core >=2.15,<2.16"
       filter_tests: false
       test_galaxy: true
 
-- stage: Galaxy_FedoraLatest_Ansible_Core_2_15
+- stage: Galaxy-fedora-latest_Ansible_Core_2_16
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: fedora-latest
-      ansible_version: "-core >=2.15,<2.16"
+      ansible_version: "-core >=2.16,<2.17"
       filter_tests: false
       test_galaxy: true
 
-- stage: Galaxy_FedoraLatest_Ansible_latest
+- stage: Galaxy-fedora-latest_Ansible_Core_2_17
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: fedora-latest
-      ansible_version: ""
+      ansible_version: "-core >=2.17"
       filter_tests: false
       test_galaxy: true
 
 # Fedora Rawhide
 
-- stage: FedoraRawhide_Ansible_Core_2_13
+- stage: fedora-rawhide_Ansible_Core_2_15
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: fedora-rawhide
-      ansible_version: "-core >=2.13,<2.14"
+      ansible_version: "-core >=2.15,<2.16"
       filter_tests: false
 
-- stage: FedoraRawhide_Ansible_Core_2_14
+- stage: fedora-rawhide_Ansible_Core_2_16
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: fedora-rawhide
-      ansible_version: "-core >=2.14,<2.15"
+      ansible_version: "-core >=2.16,<2.17"
       filter_tests: false
 
-- stage: FedoraRawhide_Ansible_Core_2_15
+- stage: fedora-rawhide_Ansible_Core_2_17
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: fedora-rawhide
-      ansible_version: "-core >=2.15,<2.16"
-      filter_tests: false
-
-- stage: FedoraRawhide_Ansible_latest
-  dependsOn: []
-  jobs:
-  - template: templates/group_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      distro: fedora-rawhide
-      ansible_version: ""
+      ansible_version: "-core >=2.17"
       filter_tests: false
 
 # CentoOS 9 Stream
 
-- stage: c9s_Ansible_Core_2_13
-  dependsOn: []
-  jobs:
-  - template: templates/group_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      distro: c9s
-      ansible_version: "-core >=2.13,<2.14"
-      filter_tests: false
-
-- stage: c9s_Ansible_Core_2_14
-  dependsOn: []
-  jobs:
-  - template: templates/group_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      distro: c9s
-      ansible_version: "-core >=2.14,<2.15"
-      filter_tests: false
-
 - stage: c9s_Ansible_Core_2_15
   dependsOn: []
   jobs:
@@ -176,39 +125,27 @@ stages:
       ansible_version: "-core >=2.15,<2.16"
       filter_tests: false
 
-- stage: c9s_Ansible_latest
+- stage: c9s_Ansible_Core_2_16
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: c9s
-      ansible_version: ""
+      ansible_version: "-core >=2.16,<2.17"
       filter_tests: false
 
-# CentOS 8 Stream
-
-- stage: c8s_Ansible_Core_2_13
+- stage: c9s_Ansible_Core_2_17
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      distro: c8s
-      ansible_version: "-core >=2.13,<2.14"
-      target_python: "/usr/libexec/platform-python"
+      distro: c9s
+      ansible_version: "-core >=2.17"
       filter_tests: false
 
-- stage: c8s_Ansible_Core_2_14
-  dependsOn: []
-  jobs:
-  - template: templates/group_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      distro: c8s
-      ansible_version: "-core >=2.14,<2.15"
-      target_python: "/usr/libexec/platform-python"
-      filter_tests: false
+# CentOS 8 Stream only works up to ansible-core 2.16.z
 
 - stage: c8s_Ansible_Core_2_15
   dependsOn: []
@@ -221,13 +158,13 @@ stages:
       target_python: "/usr/libexec/platform-python"
       filter_tests: false
 
-- stage: c8s_Ansible_latest
+- stage: c8s_Ansible_Core_2_16
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       distro: c8s
-      ansible_version: ""
+      ansible_version: "-core >=2.16,<2.17"
       target_python: "/usr/libexec/platform-python"
       filter_tests: false