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..86d5d61049455d3b3a2b555d2f0fc8535ed6a471
--- /dev/null
+++ b/molecule/c8s-build/molecule.yml
@@ -0,0 +1,18 @@
+---
+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
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..d188fd54c7a3c4adb45c45ab4f7155f7c42d7914 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,6 +29,17 @@ stages:
       scenario: centos-9
       ansible_version: ">=2.9,<2.10"
 
+# CentOS 8 Stream
+
+- stage: c8s_Ansible_2_9
+  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
diff --git a/tests/azure/build-containers.yml b/tests/azure/build-containers.yml
index 633eb825452e38ca8f3ded242b8c65ce84d728a1..9bdc5521b22acc0f1bc491b5894892a9eddecfb3 100644
--- a/tests/azure/build-containers.yml
+++ b/tests/azure/build-containers.yml
@@ -27,6 +27,12 @@ jobs:
     container_name: centos-8
     build_scenario_name: centos-8-build
 
+- template: templates/build_container.yml
+  parameters:
+    job_name_suffix: C8S
+    container_name: c8s
+    build_scenario_name: c8s-build
+
 - template: templates/build_container.yml
   parameters:
     job_name_suffix: Centos9
diff --git a/tests/azure/nightly.yml b/tests/azure/nightly.yml
index 2bef4cbd47fca348f34512d3145cb803223f6e75..9c17a6f92f77d3ed2fc14c372aea5f33b6d2c847 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: []
@@ -81,6 +81,44 @@ stages:
       scenario: centos-9
       ansible_version: ""
 
+# CentOS 8 Stream
+
+- stage: c8s_Ansible_2_9
+  dependsOn: []
+  jobs:
+  - template: templates/group_tests.yml
+    parameters:
+      build_number: $(Build.BuildNumber)
+      scenario: c8s
+      ansible_version: ">=2.9,<2.10"
+
+- stage: c8s_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: 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: ""
+
 # CentOS 8
 
 - stage: CentOS8_Ansible_2_9