diff --git a/roles/mail/templates/mailman/mm_cfg.py.j2 b/roles/mail/templates/mailman/mm_cfg.py.j2
index 2999388..1c16b47 100644
--- a/roles/mail/templates/mailman/mm_cfg.py.j2
+++ b/roles/mail/templates/mailman/mm_cfg.py.j2
@@ -106,8 +106,8 @@ POSTFIX_STYLE_VIRTUAL_DOMAINS = ['{{ mailman_domain }}']
 # alias for postmaster, abuse and mailer-daemon
 DEB_LISTMASTER = 'postmaster@{{ mail_domain }}'
 
-# Strip (wrong) DKIM headers
-REMOVE_DKIM_HEADERS = Yes
+# Remove, rename and preserve DKIM headers
+REMOVE_DKIM_HEADERS = 3
 
 # Note - if you're looking for something that is imported from mm_cfg, but you
 # didn't find it above, it's probably in /usr/lib/mailman/Mailman/Defaults.py.