diff --git a/molecule/centos-8-build/molecule.yml b/molecule/centos-8-build/molecule.yml
deleted file mode 100644
index 5698e8c0..00000000
--- a/molecule/centos-8-build/molecule.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-driver:
-  name: docker
-platforms:
-  - name: centos-8-build
-    image: "centos:centos8"
-    pre_build_image: true
-    hostname: ipaserver.test.local
-    dns_servers:
-      - 8.8.8.8
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    command: /usr/sbin/init
-    privileged: true
-provisioner:
-  name: ansible
-  playbooks:
-    prepare: ../resources/playbooks/prepare-build.yml
-prerun: false
diff --git a/molecule/centos-8/molecule.yml b/molecule/centos-8/molecule.yml
deleted file mode 100644
index 6d043503..00000000
--- a/molecule/centos-8/molecule.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-driver:
-  name: docker
-platforms:
-  - name: centos-8
-    image: quay.io/ansible-freeipa/upstream-tests:centos-8
-    pre_build_image: true
-    hostname: ipaserver.test.local
-    dns_servers:
-      - 127.0.0.1
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    command: /usr/sbin/init
-    privileged: true
-provisioner:
-  name: ansible
-  playbooks:
-    prepare: ../resources/playbooks/prepare.yml
-prerun: false
diff --git a/molecule/default b/molecule/default
index df5ea5dd..768be926 120000
--- a/molecule/default
+++ b/molecule/default
@@ -1 +1 @@
-centos-8
\ No newline at end of file
+fedora-latest
\ No newline at end of file
diff --git a/tests/README.md b/tests/README.md
index b1a3168e..631a37c8 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -92,19 +92,21 @@ pip install molecule[docker]>=3
 
 Now you can start a test container using the following command:
 ```
-molecule create -s centos-8
+molecule create -s c8s
 ```
 
 Note: Currently the containers available for running the tests are:
+ * fedora-latest
  * centos-7
- * centos-8
+ * c8s
+ * c9s
 
 ### Running the tests inside the container
 
 To run the tests you will use pytest (works the same as for VMs).
 
 ```
-RUN_TESTS_IN_DOCKER=1 IPA_SERVER_HOST=centos-8 pytest
+RUN_TESTS_IN_DOCKER=1 IPA_SERVER_HOST=c8s pytest
 ```
 
 ### Cleaning up after tests
@@ -112,7 +114,7 @@ RUN_TESTS_IN_DOCKER=1 IPA_SERVER_HOST=centos-8 pytest
 After running the tests you should probably destroy the test container using:
 
 ```
-molecule destroy -s centos-8
+molecule destroy -s c8s
 ```
 
 See [Running the tests](#running-the-tests) section for more information on available options.
diff --git a/tests/azure/azure-pipelines.yml b/tests/azure/azure-pipelines.yml
index 6dc6c762..27eb5700 100644
--- a/tests/azure/azure-pipelines.yml
+++ b/tests/azure/azure-pipelines.yml
@@ -9,55 +9,44 @@ stages:
 
 # Fedora
 
-- stage: FedoraLatest_Ansible_2_9
+- stage: Fedora_Latest
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       scenario: fedora-latest
-      ansible_version: ">=2.9,<2.10"
+      ansible_version: "-core >=2.12,<2.13"
 
 # CentOS 9 Stream
 
-- stage: c9s_Ansible_2_9
+- stage: CentOS_9_Stream
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       scenario: c9s
-      ansible_version: ">=2.9,<2.10"
+      ansible_version: "-core >=2.12,<2.13"
 
 # CentOS 8 Stream
 
-- stage: c8s_Ansible_2_9
+- stage: CentOS_8_Stream
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       scenario: c8s
-      ansible_version: ">=2.9,<2.10"
-
-# # CentOS 8
-#
-# - stage: CentOS8_Ansible_2_9
-#   dependsOn: []
-#   jobs:
-#   - template: templates/group_tests.yml
-#     parameters:
-#       build_number: $(Build.BuildNumber)
-#       scenario: centos-8
-#       ansible_version: ">=2.9,<2.10"
+      ansible_version: "-core >=2.12,<2.13"
 
 # CentOS 7
 
-- stage: CentOS7_Ansible_2_9
+- stage: CentOS_7
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
       scenario: centos-7
-      ansible_version: ">=2.9,<2.10"
+      ansible_version: "-core >=2.12,<2.13"
diff --git a/tests/azure/build-containers.yml b/tests/azure/build-containers.yml
index e5d8609a..38bcce4f 100644
--- a/tests/azure/build-containers.yml
+++ b/tests/azure/build-containers.yml
@@ -21,12 +21,6 @@ jobs:
     container_name: centos-7
     build_scenario_name: centos-7-build
 
-# - template: templates/build_container.yml
-#   parameters:
-#     job_name_suffix: Centos8
-#     container_name: centos-8
-#     build_scenario_name: centos-8-build
-
 - template: templates/build_container.yml
   parameters:
     job_name_suffix: C8S
diff --git a/tests/azure/nightly.yml b/tests/azure/nightly.yml
index 15ace521..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,43 +146,14 @@ stages:
       scenario: c8s
       ansible_version: ""
 
-# # CentOS 8
-#
-# - stage: CentOS8_Ansible_2_9
-#   dependsOn: []
-#   jobs:
-#   - template: templates/group_tests.yml
-#     parameters:
-#       build_number: $(Build.BuildNumber)
-#       scenario: centos-8
-#       ansible_version: ">=2.9,<2.10"
-#
-# - stage: CentOS8_Ansible_Core_2_11
-#   dependsOn: []
-#   jobs:
-#   - template: templates/group_tests.yml
-#     parameters:
-#       build_number: $(Build.BuildNumber)
-#       scenario: centos-8
-#       ansible_version: "-core >=2.11,<2.12"
-#
-# - stage: CentOS8_Ansible_Core_2_12
-#   dependsOn: []
-#   jobs:
-#   - template: templates/group_tests.yml
-#     parameters:
-#       build_number: $(Build.BuildNumber)
-#       scenario: centos-8
-#       ansible_version: "-core >=2.12,<2.13"
-#
-# - stage: CentOS8_Ansible_latest
-#   dependsOn: []
-#   jobs:
-#   - template: templates/group_tests.yml
-#     parameters:
-#       build_number: $(Build.BuildNumber)
-#       scenario: centos-8
-#       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
 
@@ -186,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: []
@@ -203,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"