diff --git a/roles/docker/templates/mailu.env.j2 b/roles/docker/templates/mailu.env.j2
index aa353e04..52a48652 100644
--- a/roles/docker/templates/mailu.env.j2
+++ b/roles/docker/templates/mailu.env.j2
@@ -32,7 +32,7 @@ SUBNET={{ services.mailu.subnet }}
 DOMAIN={{ base_domain }}
 
 # Hostnames for this server, separated with comas
-HOSTNAMES=mail.{{ base_domain }}
+HOSTNAMES={{ services.mailu.domain }}
 
 # Postmaster local part (will append the main mail domain)
 POSTMASTER=admin
@@ -120,7 +120,7 @@ WEB_WEBMAIL=/webmail
 SITENAME={{ base_domain }}
 
 # Linked Website URL
-WEBSITE=https://mail.{{ base_domain }}
+WEBSITE=https://{{ services.mailu.domain }}