diff --git a/features/dovecot.sh b/features/dovecot.sh
index b8765230cea66332f7bbd67c2eda8d94e6aabe38..9c9997cb349a511c7c7ebc157abafaebc7fb4013 100755
--- a/features/dovecot.sh
+++ b/features/dovecot.sh
@@ -1,4 +1,3 @@
-
 #!/bin/bash
 #
 # Copyright (C) 2019 OX Software GmbH
@@ -178,7 +177,7 @@ if [ ! -f ${INIT_STATE_FILE} ]; then
     #postconf -e "smtpd_tls_cert_file=${SSL_DIR}/certs/${FQDN}.crt"
     #postconf -e "smtpd_tls_key_file=${SSL_DIR}/private/${FQDN}.key"
     postconf -e "dovecot_destination_recipient_limit = 1"
-    postconf -e "virtual_mailbox_domains = ${MAIL_DOMAIN}"
+    postconf -e "virtual_mailbox_domains = $(hostname -f)"
     postconf -e "virtual_transport = dovecot"
     postconf -e "myorigin = \$mydomain"
     postconf -e "mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 ${ENV_SUBNET}"