diff --git a/roles/mailman/templates/mailman.cfg.j2 b/roles/mailman/templates/mailman.cfg.j2
index ab49876fcc..104d2b4a08 100644
--- a/roles/mailman/templates/mailman.cfg.j2
+++ b/roles/mailman/templates/mailman.cfg.j2
@@ -60,7 +60,7 @@ enable: yes
 header_checks:
     X-Spam: yes
     X-Spam-Flag: Yes
-    X-Spam-Status: Yes
+    X-Spam-Status: ^Yes,
 
 # The chain to jump to if any of the header patterns matches.  This must be
 # the name of an existing chain such as 'discard', 'reject', 'hold', or
diff --git a/roles/mailman/templates/mailman.cfg.lists-dev.cloud.fedoraproject.org.j2 b/roles/mailman/templates/mailman.cfg.lists-dev.cloud.fedoraproject.org.j2
index 2f83c9cc8f..2fbd9d31b2 100644
--- a/roles/mailman/templates/mailman.cfg.lists-dev.cloud.fedoraproject.org.j2
+++ b/roles/mailman/templates/mailman.cfg.lists-dev.cloud.fedoraproject.org.j2
@@ -57,7 +57,7 @@ enable: yes
 header_checks:
     X-Spam: yes
     X-Spam-Flag: Yes
-    X-Spam-Status: Yes
+    X-Spam-Status: ^Yes,
 
 # The chain to jump to if any of the header patterns matches.  This must be
 # the name of an existing chain such as 'discard', 'reject', 'hold', or