diff --git a/data/conf/rspamd/custom/bad_words.map b/data/conf/rspamd/custom/bad_words.map
index e2786352..5f19d2a9 100644
--- a/data/conf/rspamd/custom/bad_words.map
+++ b/data/conf/rspamd/custom/bad_words.map
@@ -1,40 +1,44 @@
-sex
-vagina
-erotic
-erection
-sexy
-penis
-ass
-viagra
-tits
-titty
-titties
-cum
-sperm
-slut
-porn
-cock
-pharma
-pharmacy
-seo
-business
-mobile
-marketing
-jackpot
-lotto
-lottery
-pillenversand
-kredit
-kredithilfe
-kapital
-krankenversicherung
-bitcoin
-pädophil
-freiberufler
-unternehmer
-masturbieren
-trojaner
-malware
-scooter
-escooter
-s-scooter
+/\ssex\s/i
+/\svagina\s/i
+/\serotic\s/i
+/\serection\s/i
+/\ssexy\s/i
+/\spenis\s/i
+/\sass\s/i
+/\sviagra\s/i
+/\stits\s/i
+/\stitty\s/i
+/\stitties\s/i
+/\scum\s/i
+/\ssperm\s/i
+/\sslut\s/i
+/\sporn\s/i
+/\scock\s/i
+/\spharma\s/i
+/\spharmacy\s/i
+/\sseo\s/i
+/\smarketing\s/i
+/\sjackpot\s/i
+/\slotto\s/i
+/\slottery\s/i
+/pillenversand/i
+/\skredithilfe\s/i
+/\skapital\s/i
+/\skrankenversicherung\s/i
+/bitcoin/i
+/pädophil/i
+/paedophil/i
+/freiberufler/i
+/unternehmer/i
+/masturbieren/i
+/trojaner/i
+/malware/i
+/\sscooter\s/i
+/\sescooter\s/i
+/\se-scooter\s/i
+/testost/i
+/\spotenz\s/i
+/potenzmittel/i
+/rezeptfrei/i
+/apotheke/i
+/web\sdevelopment/i
diff --git a/data/conf/rspamd/local.d/composites.conf b/data/conf/rspamd/local.d/composites.conf
index e40cc6ce..036737de 100644
--- a/data/conf/rspamd/local.d/composites.conf
+++ b/data/conf/rspamd/local.d/composites.conf
@@ -26,8 +26,7 @@ OLEFY_MACRO {
   score = 20.0;
   policy = "remove_weight";
 }
-
 BAD_WORD_BAD_TLD {
   expression = "FISHY_TLD & BAD_WORDS"
-  score = 20.0;
+  score = 10.0;
 }