diff --git a/images/postfix/config/main.cf b/images/postfix/config/main.cf
index d11e4e34fe6f70fa00c132a24f2dc1d5b1477674..248c2a8a121a30411f6d2e9ef15297fb4f1e58bc 100644
--- a/images/postfix/config/main.cf
+++ b/images/postfix/config/main.cf
@@ -92,6 +92,8 @@ postscreen_upstream_proxy_timeout = 5s
 postscreen_access_list = permit_mynetworks
 postscreen_blacklist_action = drop
 postscreen_greet_action = ignore
+# Disable zombie detection
+postscreen_greet_banner =
 postscreen_dnsbl_action = enforce
 postscreen_dnsbl_threshold = 3
 postscreen_dnsbl_allowlist_threshold = -1
diff --git a/images/postfix/config/master.cf b/images/postfix/config/master.cf
index e556ec4b840ec75ae259458f97ee9d92b4c8fa19..c0ea1bccb071e92e848f90250120994178bcfbf4 100644
--- a/images/postfix/config/master.cf
+++ b/images/postfix/config/master.cf
@@ -8,6 +8,7 @@
 smtpd     pass  -       -       -       -       -       smtpd
     -o smtpd_tls_received_header=yes
     -o content_filter=
+    -o smtpd_upstream_proxy_protocol=haproxy
 dnsblog   unix  -       -       -       -       0       dnsblog
 tlsproxy  unix  -       -       -       -       0       tlsproxy
 #smtps     inet  n       -       -       -       -       smtpd