diff --git a/Dockerfile b/Dockerfile
index 26669be..dfb3d5d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,14 +36,19 @@ RUN cd /tmp/dovecot && \
     --with-lz4 \
     --with-icu \
     --without-shadow \
-    --with-ssldir=/etc/ssl/dovecot \
+    --with-ssldir=/etc/ssl/mail \
     --with-rundir=/run/dovecot \
-    --without-shared-libs && \
+    --disable-static && \
     make && \
     make install
 
 RUN cd /tmp/pigeonhole && \
-    ./configure --with-ldap=yes --with-dovecot=/lib/dovecot  && \
+    ./configure \
+    --with-ldap=yes \
+    --with-dovecot=/lib/dovecot \
+    --with-ssldir=/etc/ssl/mail \
+    --with-rundir=/run/dovecot \
+    --disable-static && \
     make && make install
 
 FROM registry.gitlab.com/thallian/docker-confd-env:master
@@ -52,6 +57,7 @@ COPY --from=builder /lib/dovecot/ /lib/dovecot/
 COPY --from=builder /libexec/dovecot/ /libexec/dovecot/
 COPY --from=builder /bin/doveadm /bin/doveadm
 COPY --from=builder /bin/doveconf /bin/doveconf
+COPY --from=builder /bin/dsync /bin/dsync
 COPY --from=builder /sbin/dovecot /sbin/dovecot
 COPY --from=builder /usr/local/bin/sieve* /bin/