diff --git a/docker/kolab/Dockerfile b/docker/kolab/Dockerfile
index aa500a19..c1e4ad6a 100644
--- a/docker/kolab/Dockerfile
+++ b/docker/kolab/Dockerfile
@@ -1,81 +1,58 @@
-FROM centos:7
+FROM quay.io/centos/centos:stream8
 
-LABEL maintainer="contact@kolabsystems.com"
-LABEL dist=centos7
+LABEL maintainer="contact@apheleia-it.ch"
+LABEL dist=centos8
 LABEL tier=${TIER}
 
-ENV container docker
 ENV SYSTEMD_PAGER=''
-ENV DISTRO=centos7
+ENV DISTRO=centos8
 ENV LANG=en_US.utf8
 ENV LC_ALL=en_US.utf8
 
-RUN (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/*;
-
-# To speed things up, disable fastestmirror.
-RUN sed -r -i \
-        -e 's/^enabled.*$/enabled = 0/g' \
-        /etc/yum/pluginconf.d/fastestmirror.conf
-
-# Avoid using a mirrorlist (use a transparent proxy and cache everything instead).
-RUN sed -r -i \
-        -e 's/^mirrorlist/#mirrorlist/g' \
-        -e 's/^#baseurl/baseurl/g' \
-        /etc/yum.repos.d/*.repo
-
-RUN sed -i -e '/tsflags=nodocs/d' /etc/yum.conf
-
 # Add EPEL.
-RUN yum -y install \
-        epel-release yum-plugin-priorities && \
-    yum clean all
-
-# Add the EPEL key.
-RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
-
-RUN rpm --import https://mirror.apheleia-it.ch/repos/Kolab:/16/key.asc
-
-RUN yum -y install https://mirror.apheleia-it.ch/repos/Kolab:/16/kolab-16-for-el7.rpm && \
-    yum -y install kolab-16-release patch && \
-        yum clean all
-
-RUN yum -y --setopt tsflags= install kolab roundcubemail-plugin-enigma dnsmasq
-RUN mkdir /var/lib/roundcubemail/plugins/enigma && chmod 777 /var/lib/roundcubemail/plugins/enigma && chown apache:apache /var/lib/roundcubemail/plugins/enigma && chmod +x /var/lib/roundcubemail/plugins && chmod +x /var/lib/roundcubemail
+RUN dnf config-manager --set-enabled powertools && \
+    dnf -y install \
+        epel-release epel-next-release && \
+    dnf -y module enable 389-directory-server:stable/default && \
+    dnf -y module enable mariadb:10.3 && \
+    dnf clean all
+RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+
+# Install kolab
+RUN rpm --import https://mirror.apheleia-it.ch/repos/Kolab:/16/key.asc && \
+    rpm -Uvh https://mirror.apheleia-it.ch/repos/Kolab:/16/kolab-16-for-el8stream.rpm
+RUN sed -i -e '/^ssl/d' /etc/yum.repos.d/kolab*.repo && \
+    dnf config-manager --enable kolab-16-testing &&\
+    dnf -y --setopt tsflags= install kolab dnsmasq patch &&\
+    dnf clean all
 
 COPY kolab-init.service /etc/systemd/system/kolab-init.service
 COPY kolab-setenv.service /etc/systemd/system/kolab-setenv.service
 COPY kolab-vlv.service /etc/systemd/system/kolab-vlv.service
 COPY utils /root/utils
 
 RUN rm -rf /etc/systemd/system/multi-user.target.wants/{avahi-daemon,sshd}.* && \
     ln -s /etc/systemd/system/kolab-init.service \
         /etc/systemd/system/multi-user.target.wants/kolab-init.service && \
     ln -s /etc/systemd/system/kolab-setenv.service \
         /etc/systemd/system/multi-user.target.wants/kolab-setenv.service && \
     ln -s /etc/systemd/system/kolab-vlv.service \
         /etc/systemd/system/multi-user.target.wants/kolab-vlv.service
 
 RUN sed -i -r -e 's/^SELINUX=.*$/SELINUX=permissive/g' /etc/selinux/config 2>/dev/null || :
 
 RUN sed -i -r -e 's/^Listen 80$/Listen 9080/g' /etc/httpd/conf/httpd.conf
 #RUN sed -i -r -e 's/^Listen 443$/Listen 9443/g' /etc/httpd/conf/httpd.conf
 
 COPY kolab-init.sh /usr/local/sbin/
 RUN chmod 750 /usr/local/sbin/kolab-init.sh
 COPY kolab-vlv.sh /usr/local/sbin/
 RUN chmod 750 /usr/local/sbin/kolab-vlv.sh
 
 VOLUME [ "/sys/fs/cgroup" ]
 
 WORKDIR /root/
 
 CMD ["/lib/systemd/systemd"]
 
 EXPOSE 21/tcp 22/tcp 25/tcp 53/tcp 53/udp 80/tcp 110/tcp 389/tcp 443/tcp 995/tcp 5353/udp 8880/tcp 8443/tcp 8447/tcp 10143/tcp 10465/tcp 10587/tcp 11143/tcp 11993/tcp