diff --git a/build/run/docker-entrypoint/init.d/30-postfix.sh b/build/run/docker-entrypoint/init.d/30-postfix.sh
index 2333274..5448d8b 100755
--- a/build/run/docker-entrypoint/init.d/30-postfix.sh
+++ b/build/run/docker-entrypoint/init.d/30-postfix.sh
@@ -36,7 +36,8 @@ addmx+=(${MYVEMAIL_ADDMX//,/ })
 echo | tee /etc/postfix/{helo_access,rbl_override} >/dev/null
 for domain in ${addmx[@]}
 do
-    echo "${domain}    OK" | tee -a /etc/postfix/{helo_access,rbl_override} >/dev/null
+    echo "${domain}			OK" | tee -a /etc/postfix/helo_access >/dev/null
+    echo "/${domain}/			OK" | tee -a /etc/postfix/rbl_override >/dev/null
 done
 
 if [ ${MYVEMAIL_WHITELIST} ]
@@ -45,7 +46,7 @@ then
     addwhitelist+=(${MYVEMAIL_WHITELIST//,/ })
     for whitelist in ${addwhitelist[@]}
     do
-        echo "${whitelist}    OK" | tee -a /etc/postfix/rbl_override >/dev/null
+        echo "/${domain}/			OK" | tee -a /etc/postfix/rbl_override >/dev/null
     done
 fi
 
@@ -56,7 +57,7 @@ then
     addblacklist+=(${MYVEMAIL_BLACKLIST//,/ })
     for blacklist in ${addblacklist[@]}
     do
-        echo "${blacklist}    REJECT" | tee -a /etc/postfix/rbl_override >/dev/null
+        echo "/${domain}/			REJECT" | tee -a /etc/postfix/rbl_override >/dev/null
     done
 fi
 
@@ -71,4 +72,4 @@ setfacl -R -m u:postfix:rx /etc/postfix/sql/
 
 # Start postfix
 postfix start
-postmap /etc/postfix/helo_access /etc/postfix/rbl_override /etc/postfix/smtp_header_checks /etc/postfix/header_checks /etc/postfix/body_checks /etc/postfix/postscreen_access.cidr
+postmap /etc/postfix/helo_access /etc/postfix/rbl_override /etc/postfix/smtp_header_checks /etc/postfix/header_checks /etc/postfix/body_checks /etc/postfix/postscreen_access.cidr
\ No newline at end of file