diff --git a/docker/imap/Dockerfile b/docker/imap/Dockerfile
index a3579e70..379ded46 100644
--- a/docker/imap/Dockerfile
+++ b/docker/imap/Dockerfile
@@ -1,44 +1,74 @@
 FROM apheleia/almalinux9
 
 WORKDIR /root/
 
-RUN dnf -y group install "Development Tools" && \
-    dnf -y install git autoconf automake bison cyrus-sasl-devel flex gcc gperf jansson-devel libbsd-devel libtool libicu-devel libuuid-devel openssl-devel pkgconfig sqlite-devel brotli-devel libical-devel libxml2-devel libnghttp2-devel shapelib  zlib-devel pcre-devel perl-devel cyrus-imapd cyrus-sasl cyrus-sasl-plain rsync && \
+RUN dnf -y install \
+        --setopt 'tsflags=nodocs' \
+        git \
+        autoconf \
+        automake \
+        bison \
+        cyrus-sasl-devel \
+        flex \
+        gcc \
+        gcc-c++ \
+        gperf \
+        jansson-devel \
+        libbsd-devel \
+        libtool \
+        libicu-devel \
+        libuuid-devel \
+        openssl-devel \
+        pkgconfig \
+        sqlite-devel \
+        brotli-devel \
+        libzstd-devel \
+        libical-devel \
+        libxml2-devel \
+        libnghttp2-devel \
+        shapelib \
+        zlib-devel \
+        pcre-devel \
+        perl-devel \
+        cyrus-sasl \
+        cyrus-sasl-plain \
+        perl-Cyrus \
+        rsync && \
     dnf clean all
 
 ARG GIT_REF=dev/mollekopf
 ARG GIT_REMOTE=https://git.kolab.org/source/cyrus-imapd
 
 ADD build.sh /build.sh
 RUN /build.sh
 
 COPY /rootfs /
 
 VOLUME [ "/var/spool/imap" ]
 VOLUME [ "/var/lib/imap" ]
 
 RUN id default || (groupadd -g 1001 default && useradd -d /opt/app-root/ -u 1001 -g 1001 default)
 
 RUN mkdir -p /opt/app-root/src
 RUN PATHS=(/run /run/saslauthd /var/run /var/lib/imap /var/spool/imap /etc/pki/cyrus-imapd /opt/app-root/src /usr /usr/lib64 /usr/bin /usr/sbin) && \
     mkdir -p ${PATHS[@]} && \
     chmod 777 ${PATHS[@]} && \
     chown -R 1001:0 ${PATHS[@]} && \
     chmod -R g=u ${PATHS[@]}
 
 RUN PATHS=(/etc /etc/passwd /etc/saslauthd.conf /etc/cyrus.conf /etc/imapd.conf) && \
     chown 1001:0 ${PATHS[@]} && \
     chmod g=u ${PATHS[@]}
 
 USER 1001
 WORKDIR /opt/app-root/src
 
 ENV SERVICES_PORT=8000
 ENV IMAPD_CONF=/etc/imapd.conf
 ENV CYRUS_CONF=/etc/cyrus.conf
 
 # ENV APP_SERVICES_DOMAIN
 
 CMD ["/init.sh"]
 
 EXPOSE 11143/tcp 11993/tcp 11080/tcp 11443/tcp 11024/tcp 4190/tcp