diff --git a/target/postfix/master.cf b/target/postfix/master.cf
index 4369f276..bec6916a 100644
--- a/target/postfix/master.cf
+++ b/target/postfix/master.cf
@@ -40,32 +40,32 @@ smtps     inet  n       -       n       -       -       smtpd
   -o milter_macro_daemon_name=ORIGINATING
   -o cleanup_service_name=sender-cleanup
 
-pickup    fifo  n       -       y       60      1       pickup
+pickup    fifo  n       -       n       60      1       pickup
   -o content_filter=
   -o receive_override_options=no_header_body_checks
 
-cleanup   unix  n       -       y       -       0       cleanup
+cleanup   unix  n       -       n       -       0       cleanup
 qmgr      unix  n       -       n       300     1       qmgr
-tlsmgr    unix  -       -       y       1000?   1       tlsmgr
-rewrite   unix  -       -       y       -       -       trivial-rewrite
-bounce    unix  -       -       y       -       0       bounce
-defer     unix  -       -       y       -       0       bounce
-trace     unix  -       -       y       -       0       bounce
-verify    unix  -       -       y       -       1       verify
-flush     unix  n       -       y       1000?   0       flush
+tlsmgr    unix  -       -       n       1000?   1       tlsmgr
+rewrite   unix  -       -       n       -       -       trivial-rewrite
+bounce    unix  -       -       n       -       0       bounce
+defer     unix  -       -       n       -       0       bounce
+trace     unix  -       -       n       -       0       bounce
+verify    unix  -       -       n       -       1       verify
+flush     unix  n       -       n       1000?   0       flush
 proxymap  unix  -       -       n       -       -       proxymap
 proxywrite unix -       -       n       -       1       proxymap
-smtp      unix  -       -       y       -       -       smtp
-relay     unix  -       -       y       -       -       smtp
-showq     unix  n       -       y       -       -       showq
-error     unix  -       -       y       -       -       error
-retry     unix  -       -       y       -       -       error
-discard   unix  -       -       y       -       -       discard
+smtp      unix  -       -       n       -       -       smtp
+relay     unix  -       -       n       -       -       smtp
+showq     unix  n       -       n       -       -       showq
+error     unix  -       -       n       -       -       error
+retry     unix  -       -       n       -       -       error
+discard   unix  -       -       n       -       -       discard
 local     unix  -       n       n       -       -       local
 virtual   unix  -       n       n       -       -       virtual
 lmtp      unix  -       -       n       -       -       lmtp
-anvil     unix  -       -       y       -       1       anvil
-scache    unix  -       -       y       -       1       scache
+anvil     unix  -       -       n       -       1       anvil
+scache    unix  -       -       n       -       1       scache
 
 sender-cleanup unix n   -       n       -       0       cleanup
   -o syslog_name=postfix/sender-cleanup
diff --git a/target/scripts/wrapper/postfix-wrapper.sh b/target/scripts/wrapper/postfix-wrapper.sh
deleted file mode 100755
index 3a5ce5c4..00000000
--- a/target/scripts/wrapper/postfix-wrapper.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# You cannot start postfix in some foreground mode and
-# it's more or less important that docker doesn't kill
-# postfix and its chilren if you stop the container.
-#
-# Use this script with supervisord and it will take
-# care about starting and stopping postfix correctly.
-#
-# supervisord config snippet for postfix-wrapper:
-#
-# [program:postfix]
-# process_name = postfix
-# command = /path/to/postfix-wrapper.sh
-# startsecs = 0
-# autorestart = false
-#
-
-trap "service postfix stop" SIGINT
-trap "service postfix stop" SIGTERM
-trap "service postfix reload" SIGHUP
-
-service postfix start
-
-# wait until postfix is dead (triggered by trap)
-while kill -0 "$(< /var/spool/postfix/pid/master.pid)"
-do
-  sleep 5
-done
diff --git a/target/supervisor/conf.d/supervisor-app.conf b/target/supervisor/conf.d/supervisor-app.conf
index d3e84fdc..5a1083d8 100644
--- a/target/supervisor/conf.d/supervisor-app.conf
+++ b/target/supervisor/conf.d/supervisor-app.conf
@@ -131,7 +131,7 @@ autostart=false
 autorestart=true
 stdout_logfile=/var/log/supervisor/%(program_name)s.log
 stderr_logfile=/var/log/supervisor/%(program_name)s.log
-command=/usr/local/bin/postfix-wrapper.sh
+command=postfix start-fg
 
 [program:changedetector]
 startsecs=0