diff --git a/webserver/docker_uffd/templates/docker-compose.yml b/webserver/docker_uffd/templates/docker-compose.yml
index 68613b89aa8f3ca7f2d3b9c823ea450ad0e31143..cabfdd80d59c95595b31cc6630a433f51064b271 100644
--- a/webserver/docker_uffd/templates/docker-compose.yml
+++ b/webserver/docker_uffd/templates/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       TZ: "Europe/Berlin"
       UFFD_INITIAL_ADMIN_USER: "uffdadmin"
       UFFD_INITIAL_ADMIN_PW: "{{ uffd_admin_pass }}"
-      UFFD_INITIAL_ADMIN_MAIL: "admin@{{ mail_domain.warpzonems.mxserver }}"
+      UFFD_INITIAL_ADMIN_MAIL: "admin@{{ mail_domains.warpzonems.mxserver }}"
     labels:
       - com.centurylinklabs.watchtower.enable=false
       - traefik.enable=true
diff --git a/webserver/docker_uffd/templates/uffd.cfg b/webserver/docker_uffd/templates/uffd.cfg
index 62f59f70988be538e61a70a6633bc4b9996ecb62..1f14e4e2bbfe4521800e78316670b1a250af65e8 100644
--- a/webserver/docker_uffd/templates/uffd.cfg
+++ b/webserver/docker_uffd/templates/uffd.cfg
@@ -14,12 +14,12 @@ ACL_ACCESS_GROUP="uffd_access"
 # Members can create invite links for signup
 ACL_SIGNUP_GROUP="uffd_signup"
 
-MAIL_SERVER='{{ mail_domain.warpzonems.mxserver }}'
+MAIL_SERVER='{{ mail_domains.warpzonems.mxserver }}'
 MAIL_PORT=587
-MAIL_USERNAME='noreply-uffd@{{ mail_domain.warpzonems.maildomain }}' 
+MAIL_USERNAME='noreply-uffd@{{ mail_domains.warpzonems.maildomain }}' 
 MAIL_PASSWORD='{{ uffd_mail_pass }}'
 MAIL_USE_STARTTLS=True
-MAIL_FROM_ADDRESS='noreply-uffd@{{ mail_domain.warpzonems.maildomain }}'
+MAIL_FROM_ADDRESS='noreply-uffd@{{ mail_domains.warpzonems.maildomain }}'
 
 # Do not enable this on a public service! There is no spam protection implemented at the moment.
 SELF_SIGNUP=False
@@ -110,7 +110,7 @@ SITE_TITLE='uffd @ {{ global_domains.warpzonems.domain }}'
 
 # Name and contact mail address are displayed to users in a few places (plain text only!)
 ORGANISATION_NAME='Warpzone'
-ORGANISATION_CONTACT='uffd@{{ mail_domain.warpzonems.maildomain }}'
+ORGANISATION_CONTACT='uffd@{{ mail_domains.warpzonems.maildomain }}'
 
 # Optional text included in account registration mails (plain text only!)
 WELCOME_TEXT='Im Zweifel ist void schuld.'