diff --git a/docker/imap/Dockerfile b/docker/imap/Dockerfile
index 1d17665c..36504d79 100644
--- a/docker/imap/Dockerfile
+++ b/docker/imap/Dockerfile
@@ -1,68 +1,68 @@
 FROM almalinux:8
 
 LABEL maintainer="contact@apheleia-it.ch"
 LABEL dist=centos8
 LABEL tier=${TIER}
 
 ENV DISTRO=centos8
 # ENV LANG=en_US.utf8
 # ENV LC_ALL=en_US.utf8
 
 # Add EPEL.
 RUN dnf -y install dnf-plugin-config-manager && \
     dnf config-manager --set-enabled powertools && \
     dnf -y install epel-release && \
     dnf -y install iputils vim-enhanced bind-utils && \
     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-el8.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 patch &&\
     dnf clean all
 
 RUN sed -i -r -e 's/^SELINUX=.*$/SELINUX=permissive/g' /etc/selinux/config 2>/dev/null || :
 
 WORKDIR /root/
 
 RUN dnf -y group install "Development Tools"; \
     dnf -y builddep cyrus-imapd; \
     dnf -y install git perl-devel cyrus-sasl cyrus-sasl-plain procps-ng iputils bind-utils sudo
 
 RUN git clone --branch dev/mollekopf https://git.kolab.org/source/cyrus-imapd && \
     cd cyrus-imapd && \
     autoreconf -i && \
     ./configure CFLAGS="-W -Wno-unused-parameter -g -O0 -Wall -Wextra -Werror -fPIC" --enable-murder --enable-http --enable-calalarmd --enable-autocreate --enable-idled --with-openssl=yes --enable-replication --prefix=/usr && \
     make -j6 && \
     make install
 
 COPY cyrus.conf /etc/cyrus.conf
 COPY imapd.conf /etc/imapd.conf
 COPY imapd.annotations.conf /etc/imapd.annotations.conf
 COPY saslauthd.conf /etc/saslauthd.conf
 
 ADD init.sh /init.sh
 
 VOLUME [ "/var/spool/imap" ]
 VOLUME [ "/var/lib/imap" ]
 
 RUN id default || (groupadd -g 1001 default && useradd -u 1001 -g 1001 default)
 
 RUN PATHS=(/run /run/saslauthd /var/run /var/lib/imap /var/spool/imap /etc/pki/cyrus-imapd) && \
     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
 
 CMD ["/init.sh"]
 
-EXPOSE 11143/tcp 11993/tcp 11080/tcp 11443/tcp 11024/tcp
+EXPOSE 11143/tcp 11993/tcp 11080/tcp 11443/tcp 11024/tcp 4190/tcp
diff --git a/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/managesieve.inc.php b/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/managesieve.inc.php
index db2024ee..4daa3757 100644
--- a/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/managesieve.inc.php
+++ b/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/managesieve.inc.php
@@ -1,31 +1,22 @@
 <?php
     $config['managesieve_port'] = 4190;
-    $config['managesieve_host'] = '%h';
+    $config['managesieve_host'] = 'imap';
     $config['managesieve_auth_type'] = 'PLAIN';
     $config['managesieve_auth_cid'] = null;
     $config['managesieve_auth_pw'] = null;
-    $config['managesieve_usetls'] = true;
+    $config['managesieve_usetls'] = false;
     $config['managesieve_default'] = '/etc/dovecot/sieve/global';
     $config['managesieve_mbox_encoding'] = 'UTF-8';
     $config['managesieve_replace_delimiter'] = '';
     $config['managesieve_disabled_extensions'] = array();
     $config['managesieve_debug'] = false;
     $config['managesieve_vacation'] = 1;
 
     $config['managesieve_filename_extension'] = '';
     $config['managesieve_kolab_master'] = true;
 
-    // ManageSieve Connection TLS settings, adjust for Production
-    $config['managesieve_conn_options'] = Array(
-            'ssl' => Array(
-                    'verify_peer_name' => false,
-                    'verify_peer' => false,
-                    'allow_self_signed' => true
-                )
-        );
-
     if (file_exists(RCUBE_CONFIG_DIR . '/' . $_SERVER["HTTP_HOST"] . '/' . basename(__FILE__))) {
         include_once(RCUBE_CONFIG_DIR . '/' . $_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
     }
 
 ?>