diff --git a/scripts/postfix-forwarder.sh b/scripts/postfix-forwarder.sh
deleted file mode 100755
index 2937a4c1cf38746c80960776bb217aca85065287..0000000000000000000000000000000000000000
--- a/scripts/postfix-forwarder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -eux
-
-docker stop postfix-forwarder
-docker rm postfix-forwarder
-docker run -p 25:25 -d --name="postfix-forwarder" -v /data/server-wide/postfix:/data indiehosters/postfix-forwarder
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 3bb81edff31bb4643667e0af05b1b39a29c3a768..0f8eef008fcadb1ef8a87c83fcd80b728542f38e 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -21,3 +21,12 @@ etcdctl set /services/default '{"app":"nginx", "hostname":"'$1'"}'
 mkdir -p /data/server-wide/haproxy/approved-certs
 systemctl enable haproxy.service
 systemctl start  haproxy.service
+
+# Configure and start postfix
+mkdir -p /data/server-wide/postfix
+touch /data/server-wide/postfix/hostname
+touch /data/server-wide/postfix/destinations
+touch /data/server-wide/postfix/forwards
+
+systemctl enable postfix.service
+systemctl start  postfix.service