diff --git a/docker-compose.yml b/docker-compose.yml
index 0ea15b4..cbc77b9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,8 +18,9 @@ services:
       - ENABLE_SPAMASSASSIN=1
       - ENABLE_CLAMAV=1
       - ENABLE_FAIL2BAN=1
-      - POSTFIX_MAIN_CF=proxy_interfaces = 172.26.0.5
-      - POSTFIX_MASTER_CF_INET=127.0.0.1:25 inet n - n - - smtpd -o smtpd_upstream_proxy_protocol=haproxy
+      - POSTFIX_INET_PROTOCOLS=ipv4
+      - POSTFIX_MASTER_CF_INET=172.26.0.5:25 inet n - n - - smtpd -o smtpd_upstream_proxy_protocol=haproxy
+      - POSTFIX_MASTER_CF_SUBMISSION=172.26.0.5:587 inet n - n - - smtpd -o smtpd_upstream_proxy_protocol=haproxy -o smtpd_tls_security_level=may
     volumes:
       - mail-data:/var/mail
       - mail-state:/var/mail-state
@@ -31,10 +32,10 @@ services:
     labels:
       - reproxy.enabled=true
       - reproxy.server=mailserver
-      - reproxy.tcp.25=:25
-      - reproxy.tcp.465=:465
-      - reproxy.tcp.587=:587
-      - reproxy.tcp.993=:993
+      - reproxy.tcp.25=:25,proto=haproxy
+      - reproxy.tcp.465=:465,proto=haproxy
+      - reproxy.tcp.587=:587,proto=haproxy
+      - reproxy.tcp.993=:993,proto=haproxy
 
 networks:
   crabs-network: