diff --git a/containers/cobald-tardis-deployment-test-env/Dockerfile.centos7 b/containers/cobald-tardis-deployment-test-env/Dockerfile.centos7
deleted file mode 100644
index e7bc528b..00000000
--- a/containers/cobald-tardis-deployment-test-env/Dockerfile.centos7
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM centos:7
-LABEL maintainer="Manuel Giffels <giffels@gmail.com>"
-
-RUN yum -y install epel-release centos-release-scl-rh curl && yum clean all
-RUN yum --enablerepo=centos-sclo-rh -y install rh-python38 && yum clean all
-
-RUN curl -sL https://rpm.nodesource.com/setup_16.x | bash -
-
-RUN yum -y update \
-    && yum -y install git \
-                      gcc \
-                      nodejs \
-    && yum clean all
-
-# Enable rh-python38 from SCL
-ENV PATH=/opt/rh/rh-python38/root/usr/local/bin:/opt/rh/rh-python38/root/usr/bin${PATH:+:${PATH}}
-ENV LD_LIBRARY_PATH=/opt/rh/rh-python38/root/usr/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-ENV MANPATH=/opt/rh/rh-python38/root/usr/share/man:$MANPATH
-ENV PKG_CONFIG_PATH=/opt/rh/rh-python38/root/usr/lib64/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}
-ENV XDG_DATA_DIRS="/opt/rh/rh-python38/root/usr/share:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
-
-SHELL [ "/bin/bash", "--noprofile", "--norc", "-e", "-o", "pipefail", "-c" ]
diff --git a/containers/cobald-tardis-htcondor/Dockerfile b/containers/cobald-tardis-htcondor/Dockerfile
index a067406d..30bef553 100644
--- a/containers/cobald-tardis-htcondor/Dockerfile
+++ b/containers/cobald-tardis-htcondor/Dockerfile
@@ -5,7 +5,7 @@ ARG SOURCE_BRANCH=master
 ARG SOURCE_REPO_URL=https://github.com/MatterMiners/tardis
 
 RUN rpm --import http://research.cs.wisc.edu/htcondor/yum/RPM-GPG-KEY-HTCondor
-RUN dnf install -y https://research.cs.wisc.edu/htcondor/repo/10/10.0/htcondor-release-current.el8.noarch.rpm
+RUN dnf install -y https://research.cs.wisc.edu/htcondor/repo/23.x/el8/x86_64/release/htcondor-release-23.x-1.el8.noarch.rpm
 
 RUN dnf -y install epel-release && dnf clean all
 RUN dnf config-manager --set-enabled powertools
@@ -13,17 +13,21 @@ RUN dnf config-manager --set-enabled powertools
 RUN dnf -y update \
     && dnf -y install condor \
                       git \
-                      python39 \
+                      python3.11 \
                       gcc \
-                      python39-devel \
+                      python3.11-devel \
+                      python3.11-pip \
+                      slurm \
     && dnf clean all
 
-RUN python3.9 -m pip install --no-cache-dir --upgrade pip \
-    && python3.9 -m pip install --no-cache-dir git+$SOURCE_REPO_URL@$SOURCE_BRANCH
+RUN python3.11 -m pip install --no-cache-dir --upgrade pip \
+    && python3.11 -m pip install --no-cache-dir git+$SOURCE_REPO_URL@$SOURCE_BRANCH \
+    && python3.11 -m pip install --no-cache-dir cobald-hep-plugins \
+    && python3.11 -m pip install --no-cache-dir htcondor-queue-poller
 
 WORKDIR /srv
 
 COPY cobald.yml /srv/cobald.yml
 
-ENTRYPOINT ["python3.9", "-m", "cobald.daemon"]
+ENTRYPOINT ["python3.11", "-m", "cobald.daemon"]
 CMD ["/srv/cobald.yml"]
diff --git a/containers/cobald-tardis/Dockerfile b/containers/cobald-tardis/Dockerfile
index b8035e70..25ae653a 100644
--- a/containers/cobald-tardis/Dockerfile
+++ b/containers/cobald-tardis/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10-alpine
+FROM python:3.11-alpine
 LABEL maintainer="Manuel Giffels <giffels@gmail.com>"
 ARG SOURCE_BRANCH=master
 ARG SOURCE_REPO_URL=https://github.com/MatterMiners/tardis