diff --git a/.github/workflows/deployment-tests.yml b/.github/workflows/deployment-tests.yml
index c8617d01..bd7da848 100644
--- a/.github/workflows/deployment-tests.yml
+++ b/.github/workflows/deployment-tests.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os_container: ['centos7', 'centos8', 'rockylinux8', 'ubuntu20_04', 'ubuntu18_04']
+        os_container: ['centos7', 'centosstream8', 'rockylinux8', 'ubuntu20_04', 'ubuntu18_04']
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os_container: ['centos7', 'centos8', 'rockylinux8', 'ubuntu20_04', 'ubuntu18_04']
+        os_container: ['centos7', 'centosstream8', 'rockylinux8', 'ubuntu20_04', 'ubuntu18_04']
     container: matterminers/cobald-tardis-deployment-test-env:${{ matrix.os_container }}
     steps:
       - uses: actions/checkout@v2
diff --git a/containers/cobald-tardis-deployment-test-env/Dockerfile.centos8 b/containers/cobald-tardis-deployment-test-env/Dockerfile.centos8
deleted file mode 100644
index 57a9a92e..00000000
--- a/containers/cobald-tardis-deployment-test-env/Dockerfile.centos8
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM centos:8
-LABEL maintainer="Manuel Giffels <giffels@gmail.com>"
-
-RUN yum -y install epel-release curl && yum clean all
-
-RUN curl -sL https://rpm.nodesource.com/setup_12.x | bash -
-
-RUN yum -y update \
-    && yum -y install git \
-                      python38 \
-                      gcc \
-                      python38-devel \
-                      nodejs \
-                      glibc-langpack-en \
-    && yum clean all
-
-SHELL [ "/bin/bash", "--noprofile", "--norc", "-e", "-o", "pipefail", "-c" ]
diff --git a/containers/cobald-tardis-deployment-test-env/Dockerfile.centosstream8 b/containers/cobald-tardis-deployment-test-env/Dockerfile.centosstream8
new file mode 100644
index 00000000..0aaa4736
--- /dev/null
+++ b/containers/cobald-tardis-deployment-test-env/Dockerfile.centosstream8
@@ -0,0 +1,15 @@
+FROM quay.io/centos/centos:stream8
+LABEL maintainer="Manuel Giffels <giffels@gmail.com>"
+
+RUN dnf -y module enable nodejs:12
+
+RUN dnf -y update \
+    && dnf -y install git \
+                      python39 \
+                      gcc-8.5.0-7.el8 \
+                      python39-devel \
+                      nodejs \
+                      glibc-langpack-en \
+    && dnf clean all
+
+SHELL [ "/bin/bash", "--noprofile", "--norc", "-e", "-o", "pipefail", "-c" ]
diff --git a/containers/cobald-tardis-deployment-test-env/Dockerfile.rockylinux8 b/containers/cobald-tardis-deployment-test-env/Dockerfile.rockylinux8
index 5acf7226..a93da8ae 100644
--- a/containers/cobald-tardis-deployment-test-env/Dockerfile.rockylinux8
+++ b/containers/cobald-tardis-deployment-test-env/Dockerfile.rockylinux8
@@ -1,4 +1,4 @@
-FROM rockylinux/rockylinux:8
+FROM rockylinux:8
 LABEL maintainer="Manuel Giffels <giffels@gmail.com>"
 
 RUN yum -y install epel-release curl && yum clean all
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index 63736fb3..d1e87fdb 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -1,4 +1,4 @@
-.. Created by changelog.py at 2021-11-30, command
+.. Created by changelog.py at 2022-01-28, command
    '/Users/giffler/.cache/pre-commit/repor6pnmwlm/py_env-default/bin/changelog docs/source/changes compile --output=docs/source/changelog.rst'
    based on the format of 'https://keepachangelog.com/'
 
@@ -6,7 +6,7 @@
 CHANGELOG
 #########
 
-[Unreleased] - 2021-11-30
+[Unreleased] - 2022-01-28
 =========================
 
 Changed