diff --git a/tests/azure/nightly.yml b/tests/azure/nightly.yml
index f7b19a39..6926f7fd 100644
--- a/tests/azure/nightly.yml
+++ b/tests/azure/nightly.yml
@@ -34,14 +34,14 @@ stages:
       scenario: fedora-latest
       ansible_version: "-core >=2.11,<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_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: []
@@ -52,6 +52,15 @@ stages:
       scenario: fedora-latest
       ansible_version: ""
 
+- stage: FedoraLatest_Ansible_Core_latest
+  dependsOn: []
+  jobs:
+  - template: templates/group_tests.yml
+    parameters:
+      build_number: $(Build.BuildNumber)
+      scenario: fedora-latest
+      ansible_version: "-core"
+
 # CentoOS 9 Stream
 
 - stage: c9s_Ansible_2_9
@@ -72,14 +81,14 @@ stages:
       scenario: c9s
       ansible_version: "-core >=2.11,<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_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: []
@@ -90,6 +99,15 @@ stages:
       scenario: c9s
       ansible_version: ""
 
+- stage: c9s_Ansible_Core_latest
+  dependsOn: []
+  jobs:
+  - template: templates/group_tests.yml
+    parameters:
+      build_number: $(Build.BuildNumber)
+      scenario: c9s
+      ansible_version: "-core"
+
 # CentOS 8 Stream
 
 - stage: c8s_Ansible_2_9
@@ -110,14 +128,14 @@ stages:
       scenario: c8s
       ansible_version: "-core >=2.11,<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_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: []
@@ -128,6 +146,14 @@ stages:
       scenario: c8s
       ansible_version: ""
 
+- stage: c8s_Ansible_Core_latest
+  dependsOn: []
+  jobs:
+  - template: templates/group_tests.yml
+    parameters:
+      build_number: $(Build.BuildNumber)
+      scenario: c8s
+      ansible_version: "-core"
 
 # CentOS 7
 
@@ -149,14 +175,14 @@ stages:
       scenario: centos-7
       ansible_version: "-core >=2.11,<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_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: []
@@ -166,3 +192,12 @@ stages:
       build_number: $(Build.BuildNumber)
       scenario: centos-7
       ansible_version: ""
+
+- stage: CentOS7_Ansible_Core_latest
+  dependsOn: []
+  jobs:
+  - template: templates/group_tests.yml
+    parameters:
+      build_number: $(Build.BuildNumber)
+      scenario: centos-7
+      ansible_version: "-core"