diff --git a/build/run/docker-entrypoint/init.d/30-postfix.sh b/build/run/docker-entrypoint/init.d/30-postfix.sh
index 8add629..1a685b6 100755
--- a/build/run/docker-entrypoint/init.d/30-postfix.sh
+++ b/build/run/docker-entrypoint/init.d/30-postfix.sh
@@ -34,11 +34,12 @@ fi
 addmx=(${MYVEMAIL_DOMAIN})
 addmx+=(${MYVEMAIL_ADDMX//,/ })
 echo -n | tee /etc/postfix/{helo_access,{whitelisted,blacklisted}_{domains,emails}} >/dev/null
-echo ".outbound.protection.outlook.com			OK Outlook helos" >/etc/postfix/helo_access
+
+echo "/\.outbound\.protection\.outlook\.com$/			OK Outlook services" >/etc/postfix/helo_access
+
 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/{helo_access,whitelisted_domains} >/dev/null
 done
 
 # Whitelist domains or server IP addresses