diff --git a/dovecot/Dockerfile b/dovecot/Dockerfile
index ee80fe42..9e87f12f 100644
--- a/dovecot/Dockerfile
+++ b/dovecot/Dockerfile
@@ -3,12 +3,10 @@ FROM alpine:edge
 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
  && apk add --no-cache \
      dovecot dovecot-sqlite dovecot-pigeonhole-plugin dovecot-pigeonhole-plugin-extdata \
-     rspamd-client@testing \
-     bash
+     rspamd-client@testing python py-jinja2
 
-COPY conf /etc/dovecot
+COPY conf /conf
 COPY sieve /var/lib/dovecot
+COPY start.py /start.py
 
-COPY start.sh /start.sh
-
-CMD ["/start.sh"]
+CMD /start.py
diff --git a/dovecot/conf/dovecot-sql.conf.ext b/dovecot/conf/dovecot-sql.conf.ext
index e42abb84..d2e31016 100644
--- a/dovecot/conf/dovecot-sql.conf.ext
+++ b/dovecot/conf/dovecot-sql.conf.ext
@@ -3,7 +3,7 @@ connect = /data/main.db
 
 # Return the user hashed password
 password_query = \
- SELECT password \
+ SELECT NULL as password, 'Y' as nopassword, '{{ FRONT_ADDRESS }}' as allow_nets \
    FROM user \
   WHERE user.email = '%u'
 
diff --git a/dovecot/conf/dovecot.conf b/dovecot/conf/dovecot.conf
index faa41bf7..a1ec72fd 100644
--- a/dovecot/conf/dovecot.conf
+++ b/dovecot/conf/dovecot.conf
@@ -52,27 +52,11 @@ namespace inbox {
   }
 }
 
-###############
-# TLS
-###############
-ssl = yes
-ssl_cert = </certs/cert.pem
-ssl_key = </certs/key.pem
-# This will be enabled once 2.3 is released
-# ssl_dh = </certs/dhparam.pem
-# In the meanwhile:
-ssl_dh_parameters_length = 2048
-# TLS hardening is based on the following documentation:
-# https://bettercrypto.org/static/applied-crypto-hardening.pdf
-ssl_protocols=!SSLv3 !SSLv2
-ssl_cipher_list = EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA256:EECDH:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!IDEA:!ECDSA:kEDH:CAMELLIA128-SHA:AES128-SHA
-ssl_prefer_server_ciphers = yes
-ssl_options = no_compression
-
 ###############
 # Authentication
 ###############
 auth_mechanisms = plain login
+disable_plaintext_auth = no
 
 passdb {
   driver = sql
@@ -88,10 +72,6 @@ service auth {
   user = dovecot
   unix_listener auth-userdb {
   }
-
-  inet_listener {
-    port = 2102
-  }
 }
 
 service auth-worker {
@@ -119,9 +99,6 @@ service imap-login {
   inet_listener imap {
     port = 143
   }
-  inet_listener imaps {
-    port = 993
-  }
 }
 
 ###############
@@ -149,7 +126,7 @@ plugin {
 ###############
 
 service managesieve-login {
-	inet_listener sieve {
+  inet_listener sieve {
     port = 4190
   }
 }
@@ -158,12 +135,12 @@ service managesieve {
 }
 
 plugin {
-	sieve = file:~/sieve;active=~/.dovecot.sieve
+  sieve = file:~/sieve;active=~/.dovecot.sieve
   sieve_plugins = sieve_extdata sieve_imapsieve sieve_extprograms
   sieve_global_extensions = +vnd.dovecot.extdata +spamtest +spamtestplus +vnd.dovecot.execute
-	sieve_before = /var/lib/dovecot/before.sieve
-	sieve_default = /var/lib/dovecot/default.sieve
-	sieve_after = /var/lib/dovecot/after.sieve
+  sieve_before = /var/lib/dovecot/before.sieve
+  sieve_default = /var/lib/dovecot/default.sieve
+  sieve_after = /var/lib/dovecot/after.sieve
   sieve_extdata_dict_uri = proxy::sieve
 
   # Sieve execute
diff --git a/dovecot/start.py b/dovecot/start.py
new file mode 100755
index 00000000..ce6390cd
--- /dev/null
+++ b/dovecot/start.py
@@ -0,0 +1,20 @@
+#!/usr/bin/python
+
+import jinja2
+import os
+import socket
+import glob
+	
+convert = lambda src, dst: open(dst, "w").write(jinja2.Template(open(src).read()).render(**os.environ))
+
+# Actual startup script
+os.environ["FRONT_ADDRESS"] = socket.gethostbyname("front")
+
+for postfix_file in glob.glob("/conf/*.cf"):
+    convert(postfix_file, os.path.join("/etc/postfix", os.path.basename(postfix_file)))
+
+convert("/conf/rsyslog.conf", "/etc/rsyslog.conf")
+
+# Run postfix
+os.system("chown -R mail:mail /mail /var/lib/dovecot")
+os.execv("/usr/sbin/dovecot" ["dovecot", "-c", "/etc/dovecot/dovecot.conf", "-F"])
diff --git a/dovecot/start.sh b/dovecot/start.sh
deleted file mode 100755
index 7cfd26a0..00000000
--- a/dovecot/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Substitute configuration
-for VARIABLE in `env | cut -f1 -d=`; do
-  sed -i "s={{ $VARIABLE }}=${!VARIABLE}=g" /etc/dovecot/*.conf
-done
-
-# Fix permissions
-chown -R mail:mail /mail
-chown -R mail:mail /var/lib/dovecot
-
-# Run dovecot
-exec /usr/sbin/dovecot -c /etc/dovecot/dovecot.conf -F