diff --git a/molecule/c8s-build/Dockerfile b/molecule/c8s-build/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..7bdc1764715ddabb87fb0bdbb13204ad72144cdc
--- /dev/null
+++ b/molecule/c8s-build/Dockerfile
@@ -0,0 +1,30 @@
+FROM quay.io/centos/centos:stream8
+ENV container=docker
+
+RUN rm -fv /var/cache/dnf/metadata_lock.pid; \
+dnf makecache; \
+dnf --assumeyes install \
+    /usr/bin/python3 \
+    /usr/bin/python3-config \
+    /usr/bin/dnf-3 \
+    sudo \
+    bash \
+    systemd \
+    procps-ng \
+    iproute && \
+dnf clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*;\
+rm -f /etc/systemd/system/*.wants/*;\
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*;\
+rm -f /lib/systemd/system/anaconda.target.wants/*; \
+rm -rf /var/cache/dnf/;
+
+STOPSIGNAL RTMIN+3
+
+VOLUME ["/sys/fs/cgroup"]
+
+CMD ["/usr/sbin/init"]
diff --git a/molecule/c8s-build/molecule.yml b/molecule/c8s-build/molecule.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8855215190e13f2f6f7b535385cc07b4284d46e9
--- /dev/null
+++ b/molecule/c8s-build/molecule.yml
@@ -0,0 +1,19 @@
+---
+driver:
+  name: docker
+platforms:
+  - name: c8s-build
+    image: "quay.io/centos/centos:stream8"
+    dockerfile: Dockerfile
+    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/c8s/molecule.yml b/molecule/c8s/molecule.yml
new file mode 100644
index 0000000000000000000000000000000000000000..79f35c547a21e4ff869e66f1c17d054b3b39d9d6
--- /dev/null
+++ b/molecule/c8s/molecule.yml
@@ -0,0 +1,19 @@
+---
+driver:
+  name: docker
+platforms:
+  - name: c8s
+    image: quay.io/ansible-freeipa/upstream-tests:c8s
+    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/tests/azure/azure-pipelines.yml b/tests/azure/azure-pipelines.yml
index b1cf346953839877f2422b352503b2479cfc4a97..199cf8e98ed20616a3028129e67191e1006c7ef4 100644
--- a/tests/azure/azure-pipelines.yml
+++ b/tests/azure/azure-pipelines.yml
@@ -18,9 +18,9 @@ stages:
       scenario: fedora-latest
       ansible_version: ">=2.9,<2.10"
 
-# CentOS 9
+# CentOS 9 Stream
 
-- stage: CentOS9_Ansible_2_9
+- stage: c9s_Ansible_2_9
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
@@ -29,17 +29,28 @@ stages:
       scenario: centos-9
       ansible_version: ">=2.9,<2.10"
 
-# CentOS 8
+# CentOS 8 Stream
 
-- stage: CentOS8_Ansible_2_9
+- stage: c8s_Ansible_2_9
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: centos-8
+      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"
+
 # CentOS 7
 
 - stage: CentOS7_Ansible_2_9
diff --git a/tests/azure/build-containers.yml b/tests/azure/build-containers.yml
index 633eb825452e38ca8f3ded242b8c65ce84d728a1..000b542c0e0aa4f27fc4ba3ab91d2b8a588742ce 100644
--- a/tests/azure/build-containers.yml
+++ b/tests/azure/build-containers.yml
@@ -21,11 +21,17 @@ 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: Centos8
-    container_name: centos-8
-    build_scenario_name: centos-8-build
+    job_name_suffix: C8S
+    container_name: c8s
+    build_scenario_name: c8s-build
 
 - template: templates/build_container.yml
   parameters:
diff --git a/tests/azure/nightly.yml b/tests/azure/nightly.yml
index ccecb8dba7866bb4c4ecaf0d055f1ca5c43b355d..32aec971ecef412dd4f6439e1d12000c8b62daa3 100644
--- a/tests/azure/nightly.yml
+++ b/tests/azure/nightly.yml
@@ -52,7 +52,7 @@ stages:
       scenario: fedora-latest
       ansible_version: ""
 
-# CentoOS 9
+# CentoOS 9 Stream
 
 - stage: CentOS9_Ansible_2_9
   dependsOn: []
@@ -90,18 +90,18 @@ stages:
       scenario: centos-9
       ansible_version: ""
 
-# CentOS 8
+# CentOS 8 Stream
 
-- stage: CentOS8_Ansible_2_9
+- stage: c8s_Ansible_2_9
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: centos-8
+      scenario: c8s
       ansible_version: ">=2.9,<2.10"
 
-- stage: CentOS8_Ansible_Core_2_11
+- stage: c8s_Ansible_Core_2_11
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
@@ -110,24 +110,62 @@ stages:
       scenario: centos-8
       ansible_version: "-core >=2.11,<2.12"
 
-- stage: CentOS8_Ansible_Core_2_12
+- stage: c8s_Ansible_Core_2_12
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: centos-8
+      scenario: c8s
       ansible_version: "-core >=2.12,<2.13"
 
-- stage: CentOS8_Ansible_latest
+- stage: c8s_Ansible_latest
   dependsOn: []
   jobs:
   - template: templates/group_tests.yml
     parameters:
       build_number: $(Build.BuildNumber)
-      scenario: centos-8
+      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: ""
+
 # CentOS 7
 
 - stage: CentOS7_Ansible_2_9
diff --git a/tests/azure/templates/build_container.yml b/tests/azure/templates/build_container.yml
index b474c9641d34b7bca18ebe10154b29261689f0a0..7d5c1fb0700089bf4b945c78601296b493ff1987 100644
--- a/tests/azure/templates/build_container.yml
+++ b/tests/azure/templates/build_container.yml
@@ -6,6 +6,9 @@ parameters:
     type: string
   - name: build_scenario_name
     type: string
+  - name: python_version
+    type: string
+    default: 3.x
 
 jobs:
 - job: BuildTestImage${{ parameters.job_name_suffix }}
@@ -13,7 +16,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.6'
+      versionSpec: '${{ parameters.python_version }}'
 
   - script: python -m pip install --upgrade pip setuptools wheel ansible
     displayName: Install tools
diff --git a/tests/azure/templates/group_tests.yml b/tests/azure/templates/group_tests.yml
index 5fe0c7a27a87fcfc71ee3bd6005a7f80655d44a2..e3e67fa2df437169a3b9c4aec65dd58d8494af16 100644
--- a/tests/azure/templates/group_tests.yml
+++ b/tests/azure/templates/group_tests.yml
@@ -2,7 +2,7 @@
 parameters:
   - name: scenario
     type: string
-    default: centos-8
+    default: fedora-latest
   - name: build_number
     type: string
   - name: ansible_version
diff --git a/tests/azure/templates/playbook_tests.yml b/tests/azure/templates/playbook_tests.yml
index 299db69252d26e968dc953f9f52cde341a3e9712..097750457976d2e52775feaf0b646dd361880deb 100644
--- a/tests/azure/templates/playbook_tests.yml
+++ b/tests/azure/templates/playbook_tests.yml
@@ -8,7 +8,7 @@ parameters:
     default: 1
   - name: scenario
     type: string
-    default: centos-8
+    default: fedora-latest
   - name: ansible_version
     type: string
     default: ""
diff --git a/tests/azure/templates/pytest_tests.yml b/tests/azure/templates/pytest_tests.yml
index 3d8883c14a0812671d07f3acdab8d28fff478249..92783c52e02bbccb6facac88a64213f2e9f8c68d 100644
--- a/tests/azure/templates/pytest_tests.yml
+++ b/tests/azure/templates/pytest_tests.yml
@@ -4,6 +4,7 @@ parameters:
     type: string
   - name: scenario
     type: string
+    default: fedora-latest
   - name: ansible_version
     type: string
     default: ""