diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5ab606a..2ce0a0c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * pbbouncer: minor fixes
 * varnish: Allow the systemd template to be overriden with a template outside of the role
 * postfix (packmail or when postfix_slow_transport_include is True): change `minimal_backoff_time` from 2h to 15m (see HowtoPostfix)
+* postfix (packmail) : optimize Amavis integration
 
 ### Fixed
 
diff --git a/postfix/templates/packmail_main.cf.j2 b/postfix/templates/packmail_main.cf.j2
index 44596d40..0d80cf00 100644
--- a/postfix/templates/packmail_main.cf.j2
+++ b/postfix/templates/packmail_main.cf.j2
@@ -410,11 +410,15 @@ broken_sasl_auth_clients = yes
 smtpd_sasl_type = dovecot
 smtpd_sasl_path = private/auth-client
 
-# Amavis and OpenDKIM
+# Amavis
 content_filter = smtp-amavis:[127.0.0.1]:10024
+smtp-amavis_destination_concurrency_failed_cohort_limit = 0
+smtp-amavis_destination_concurrency_negative_feedback = 0
+smtp-amavis_destination_concurrency_limit = 2
+
+# OpenDKIM
 smtpd_milters = inet:[127.0.0.1]:8891
 non_smtpd_milters = inet:[127.0.0.1]:8891
-smtp-amavis_destination_concurrency_failed_cohort_limit = 0
 
 {% if postfix_slow_transport_include == True %}
 # Slow transports configuration