diff --git a/build/run/docker-entrypoint/init.d/30-postfix.sh b/build/run/docker-entrypoint/init.d/30-postfix.sh
index 1d331cf..4e053b7 100755
--- a/build/run/docker-entrypoint/init.d/30-postfix.sh
+++ b/build/run/docker-entrypoint/init.d/30-postfix.sh
@@ -37,7 +37,7 @@ echo -n | tee /etc/postfix/{helo_access,{whitelisted,blacklisted}_{domains,email
 for domain in ${addmx[@]}
 do
     echo "${domain}			OK Primary and backup mail servers" | tee -a /etc/postfix/helo_access >/dev/null
-    echo "/${domain/./\\.}$/			OK Primary and backup mail servers" | tee -a /etc/postfix/whitelisted_domains >/dev/null
+    echo "/^${domain/./\\.}$/			OK Primary and backup mail servers" | tee -a /etc/postfix/whitelisted_domains >/dev/null
 done
 
 # Whitelist domains or server IP addresses
@@ -47,7 +47,7 @@ then
     addwhitelist_domain+=(${MYVEMAIL_WHITELIST_DOMAINS//,/ })
     for whitelist_domain in ${addwhitelist_domain[@]}
     do
-        echo "/${whitelist_domain/./\\.}$/			OK Whitelisted domain" | tee -a /etc/postfix/whitelisted_domains >/dev/null
+        echo "/^${whitelist_domain/./\\.}$/			OK Whitelisted domain" | tee -a /etc/postfix/whitelisted_domains >/dev/null
     done
 fi
 
@@ -69,7 +69,7 @@ then
     addblacklist_domain+=(${MYVEMAIL_BLACKLIST_DOMAINS//,/ })
     for blacklist_domain in ${addblacklist_domain[@]}
     do
-        echo "/${blacklist_domain/./\\.}$/			REJECT Blacklisted domain" | tee -a /etc/postfix/blacklisted_domains >/dev/null
+        echo "/^${blacklist_domain/./\\.}$/			REJECT Blacklisted domain" | tee -a /etc/postfix/blacklisted_domains >/dev/null
     done
 else
     echo "/^null.void$/			OK Dummy entry" >/etc/postfix/blacklisted_domains