diff --git a/data/Dockerfiles/dovecot/Dockerfile b/data/Dockerfiles/dovecot/Dockerfile
index ecdfaf2c..88b72b6d 100644
--- a/data/Dockerfiles/dovecot/Dockerfile
+++ b/data/Dockerfiles/dovecot/Dockerfile
@@ -27,7 +27,8 @@ RUN wget http://hg.dovecot.org/dovecot-antispam-plugin/archive/tip.tar.gz -O - |
 	&& make \
 	&& make install
 
-ADD rspamd-pipe /usr/local/bin/rspamd-pipe
+COPY ./rspamd-pipe /usr/local/bin/rspamd-pipe
+COPY ./docker-entrypoint.sh /
 
 RUN chmod +x /usr/local/bin/rspamd-pipe
 RUN groupadd -g 5000 vmail
@@ -35,4 +36,5 @@ RUN useradd -g vmail -u 5000 vmail -d /var/vmail
 
 EXPOSE 24 10001
 
+ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["/usr/sbin/dovecot", "-F"]
diff --git a/data/Dockerfiles/dovecot/docker-entrypoint.sh b/data/Dockerfiles/dovecot/docker-entrypoint.sh
new file mode 100755
index 00000000..a9b8beef
--- /dev/null
+++ b/data/Dockerfiles/dovecot/docker-entrypoint.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+sed -i "/^connect/c\connect = \"host=mysql dbname=${DBNAME} user=${DBUSER} password=${DBPASS}\"" /etc/dovecot/sql/*
+
+exec "$@"