diff --git a/core/postfix/conf/main.cf b/core/postfix/conf/main.cf
index 474bf42c..32996095 100644
--- a/core/postfix/conf/main.cf
+++ b/core/postfix/conf/main.cf
@@ -23,6 +23,7 @@ alias_maps =
 podop = socketmap:unix:/tmp/podop.socket:
 
 postscreen_upstream_proxy_protocol = haproxy
+compatibility_level=3.6
 
 # Only accept virtual emails
 mydestination =
diff --git a/core/postfix/conf/rsyslog.conf b/core/postfix/conf/rsyslog.conf
index 6423eb4d..b1d2f389 100644
--- a/core/postfix/conf/rsyslog.conf
+++ b/core/postfix/conf/rsyslog.conf
@@ -31,6 +31,8 @@ module(load="imuxsock")
 # Discard messages from local test requests
 :msg, contains, "connect from localhost[127.0.0.1]"  ~
 :msg, contains, "connect from localhost[::1]"  ~
+:msg, contains, "haproxy read: short protocol header: QUIT"  ~
+:msg, contains, "discarding EHLO keywords: PIPELINING"  ~
 
 {% if POSTFIX_LOG_FILE %}
 # Log mail logs to file