diff --git a/tests/azure/nightly.yml b/tests/azure/nightly.yml
index f7b19a39ab20d8e3c9cba7fd2084d24c018c7e66..6926f7fdcde7b71416b9935d4a812c44cc41261f 100644
--- a/tests/azure/nightly.yml
+++ b/tests/azure/nightly.yml
@@ -34,23 +34,32 @@ stages:
       scenario: fedora-latest
       ansible_version: "-core >=2.11,<2.12"
 
-- stage: FedoraLatest_Ansible_Core_2_12
+# - stage: FedoraLatest_Ansible_Core_2_12
+#   dependsOn: []
+#   jobs:
+#   - template: templates/group_tests.yml
+#     parameters:
+#       build_number: $(Build.BuildNumber)
+#       scenario: fedora-latest
+#       ansible_version: "-core >=2.12,<2.13"
+
+- stage: FedoraLatest_Ansible_latest
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       scenario: fedora-latest
-      ansible_version: "-core >=2.12,<2.13"
+      ansible_version: ""
 
-- stage: FedoraLatest_Ansible_latest
+- stage: FedoraLatest_Ansible_Core_latest
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       scenario: fedora-latest
-      ansible_version: ""
+      ansible_version: "-core"
 
 # CentoOS 9 Stream
 
@@ -72,23 +81,32 @@ stages:
       scenario: c9s
       ansible_version: "-core >=2.11,<2.12"
 
-- stage: c9s_Ansible_Core_2_12
+# - stage: c9s_Ansible_Core_2_12
+#   dependsOn: []
+#   jobs:
+#   - template: templates/group_tests.yml
+#     parameters:
+#       build_number: $(Build.BuildNumber)
+#       scenario: c9s
+#       ansible_version: "-core >=2.12,<2.13"
+
+- stage: c9s_Ansible_latest
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       scenario: c9s
-      ansible_version: "-core >=2.12,<2.13"
+      ansible_version: ""
 
-- stage: c9s_Ansible_latest
+- stage: c9s_Ansible_Core_latest
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       scenario: c9s
-      ansible_version: ""
+      ansible_version: "-core"
 
 # CentOS 8 Stream
 
@@ -110,24 +128,32 @@ stages:
       scenario: c8s
       ansible_version: "-core >=2.11,<2.12"
 
-- stage: c8s_Ansible_Core_2_12
+# - stage: c8s_Ansible_Core_2_12
+#   dependsOn: []
+#   jobs:
+#   - template: templates/group_tests.yml
+#     parameters:
+#       build_number: $(Build.BuildNumber)
+#       scenario: c8s
+#       ansible_version: "-core >=2.12,<2.13"
+
+- stage: c8s_Ansible_latest
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       scenario: c8s
-      ansible_version: "-core >=2.12,<2.13"
+      ansible_version: ""
 
-- stage: c8s_Ansible_latest
+- stage: c8s_Ansible_Core_latest
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       scenario: c8s
-      ansible_version: ""
-
+      ansible_version: "-core"
 
 # CentOS 7
 
@@ -149,20 +175,29 @@ stages:
       scenario: centos-7
       ansible_version: "-core >=2.11,<2.12"
 
-- stage: CentOS7_Ansible_Core_2_12
+# - stage: CentOS7_Ansible_Core_2_12
+#   dependsOn: []
+#   jobs:
+#   - template: templates/group_tests.yml
+#     parameters:
+#       build_number: $(Build.BuildNumber)
+#       scenario: centos-7
+#       ansible_version: "-core >=2.12,<2.13"
+
+- stage: CentOS7_Ansible_latest
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       scenario: centos-7
-      ansible_version: "-core >=2.12,<2.13"
+      ansible_version: ""
 
-- stage: CentOS7_Ansible_latest
+- stage: CentOS7_Ansible_Core_latest
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       scenario: centos-7
-      ansible_version: ""
+      ansible_version: "-core"