diff --git a/data/conf/rspamd/local.d/antivirus.conf b/data/conf/rspamd/local.d/antivirus.conf
index 9f9650a9..8c46821f 100644
--- a/data/conf/rspamd/local.d/antivirus.conf
+++ b/data/conf/rspamd/local.d/antivirus.conf
@@ -1,5 +1,8 @@
 clamav {
-  scan_mime_parts = true;
+  # Scan whole message
+  scan_mime_parts = false;
+  #scan_text_mime = true;
+  #scan_image_mime = true;
   symbol = "CLAM_VIRUS";
   type = "clamav";
   log_clean = true;
diff --git a/data/conf/rspamd/local.d/metrics.conf b/data/conf/rspamd/local.d/metrics.conf
index 1109606c..7ef179e4 100644
--- a/data/conf/rspamd/local.d/metrics.conf
+++ b/data/conf/rspamd/local.d/metrics.conf
@@ -1,7 +1,7 @@
 actions {
 	reject = 15;
-	add_header = 5;
-	greylist = 4;
+	add_header = 8;
+	greylist = 7;
 }
 
 symbol "MAILCOW_AUTH" {