diff --git a/rspamd/local.d/milter_headers.inc b/rspamd/local.d/milter_headers.inc
index b9e8ec1e..3d526ca2 100644
--- a/rspamd/local.d/milter_headers.inc
+++ b/rspamd/local.d/milter_headers.inc
@@ -1,12 +1,55 @@
 extended_spam_headers = true;
 use = ["x-spamd-bar", "x-spam-level", "authentication-results"];
 authenticated_headers = ["authentication-results"];
-skip_local = false;
-skip_authenticated = true;
-
 routines {
   x-rspamd-server {
     hostname = mail.solusar.de
   }
+  authentication-results {
+    # Name of header
+    header = "Authentication-Results";
+    # Remove existing headers
+    remove = 1;
+    # Set this false not to add SMTP usernames in authentication-results
+    add_smtp_user = true;
+    # SPF/DKIM/DMARC symbols in case these are redefined
+    spf_symbols {
+      pass = "R_SPF_ALLOW";
+      fail = "R_SPF_FAIL";
+      softfail = "R_SPF_SOFTFAIL";
+      neutral = "R_SPF_NEUTRAL";
+      temperror = "R_SPF_DNSFAIL";
+      none = "R_SPF_NA";
+      permerror = "R_SPF_PERMFAIL";
+    }
+    dkim_symbols {
+      pass = "R_DKIM_ALLOW";
+      fail = "R_DKIM_REJECT";
+      temperror = "R_DKIM_TEMPFAIL";
+      none = "R_DKIM_NA";
+      permerror = "R_DKIM_PERMFAIL";
+    }
+    dmarc_symbols {
+      pass = "DMARC_POLICY_ALLOW";
+      permerror = "DMARC_BAD_POLICY";
+      temperror = "DMARC_DNSFAIL";
+      none = "DMARC_NA";
+      reject = "DMARC_POLICY_REJECT";
+      softfail = "DMARC_POLICY_SOFTFAIL";
+      quarantine = "DMARC_POLICY_QUARANTINE";
+    }
+  }
+  x-spamd-level {
+    header = "X-Spam-Level";
+    char = "*";
+    remove = 0;
+  }
+  x-spamd-bar {
+    header = "X-Spamd-Bar";
+    positive = "+";
+    negative = "-";
+    neutral = "/";
+    remove = 0;
+  }
 }