diff --git a/roles/web-app-mailu/templates/env.j2 b/roles/web-app-mailu/templates/env.j2
index 079c9b1b..3a8b6f60 100644
--- a/roles/web-app-mailu/templates/env.j2
+++ b/roles/web-app-mailu/templates/env.j2
@@ -20,7 +20,7 @@ SUBNET={{networks.local['web-app-mailu'].subnet}}
 DOMAIN={{ applications | get_app_conf(application_id,'domain') }}
 
 # Hostnames for this server, separated with comas
-HOSTNAMES={{domains | get_domain(application_id)}}
+HOSTNAMES={{ domains[application_id] | join(',') }}
 
 # Postmaster local part (will append the main mail domain)
 POSTMASTER=admin
@@ -105,7 +105,7 @@ WEB_WEBMAIL=/webmail
 SITENAME=Mailservices
 
 # Linked Website URL
-WEBSITE=https://{{domains | get_domain(application_id)}}
+WEBSITE={{ domains | get_url(application_id, WEB_PROTOCOL) }}