diff --git a/.cirrus.yml b/.cirrus.yml
index 5d223c089c..6cde730bb3 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -104,6 +104,13 @@ fedora32_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
+centosstream8_task:
+  container:
+    # Stream 8 support should be 5 years, so until 2024. but I cannot find a concrete timeline --cpk
+    dockerfile: ci/centos-stream-8/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
 centos8_task:
   container:
     # CentOS 8 EOL: May 31, 2029
diff --git a/ci/centos-stream-8/Dockerfile b/ci/centos-stream-8/Dockerfile
new file mode 100644
index 0000000000..c2b6b4d3aa
--- /dev/null
+++ b/ci/centos-stream-8/Dockerfile
@@ -0,0 +1,23 @@
+FROM quay.io/centos/centos:stream8
+
+RUN dnf config-manager --set-enabled powertools
+
+RUN dnf -y install \
+    bison \
+    cmake \
+    diffutils \
+    flex \
+    git \
+    gcc \
+    gcc-c++ \
+    libpcap-devel \
+    make \
+    openssl-devel \
+    python3-devel \
+    python3-pip\
+    sqlite \
+    swig \
+    zlib-devel \
+  && dnf clean all && rm -rf /var/cache/dnf
+
+RUN pip3 install junit2html