diff --git a/images/postfix/config/main.cf b/images/postfix/config/main.cf
index 11281de1a6ff2b5572ffffe32d81ede4972205e9..d11e4e34fe6f70fa00c132a24f2dc1d5b1477674 100644
--- a/images/postfix/config/main.cf
+++ b/images/postfix/config/main.cf
@@ -87,6 +87,8 @@ virtual_transport = lmtp:inet:dovecot-internal:24
## Postscreen Configuration
##
+postscreen_upstream_proxy_protocol = haproxy
+postscreen_upstream_proxy_timeout = 5s
postscreen_access_list = permit_mynetworks
postscreen_blacklist_action = drop
postscreen_greet_action = ignore
@@ -172,5 +174,3 @@ maximal_queue_lifetime = 1d
bounce_queue_lifetime = 1d
unverified_recipient_reject_code = 577
compatibility_level = 2
-
-postscreen_upstream_proxy_protocol = haproxy
diff --git a/images/postfix/config/master.cf b/images/postfix/config/master.cf
index 3002042fae4a55cb5851682ccf94d33f09a321bc..e556ec4b840ec75ae259458f97ee9d92b4c8fa19 100644
--- a/images/postfix/config/master.cf
+++ b/images/postfix/config/master.cf
@@ -3,11 +3,13 @@
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
10025 inet n - - - 1 postscreen
+ -o postscreen_upstream_proxy_protocol=haproxy
+ -o syslog_name=postfix/10025
smtpd pass - - - - - smtpd
-o smtpd_tls_received_header=yes
-o content_filter=
dnsblog unix - - - - 0 dnsblog
-#tlsproxy unix - - - - 0 tlsproxy
+tlsproxy unix - - - - 0 tlsproxy
#smtps inet n - - - - smtpd
# -o syslog_name=postfix/smtps
# -o smtpd_tls_wrappermode=yes