diff --git a/develop/docker_warpinfratest/templates/config.ini b/develop/docker_warpinfratest/templates/config.ini
index 4dcff26d84df93ecde164e4315bc64a4cefb6fdb..5412e9fb4f858d1098b24e1fc68af3b64e9cbfc9 100644
--- a/develop/docker_warpinfratest/templates/config.ini
+++ b/develop/docker_warpinfratest/templates/config.ini
@@ -39,11 +39,11 @@ LDAP_GROUP_IS_STAFF = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
 LDAP_GROUP_SUPERUSER = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
 
 [email]
-SMTP_HOST = smtp.warpzone.ms
-SMTP_PORT = 25
-SMTP_USERNAME = noreply@warpzone.ms
+SMTP_HOST = {{ smtp_host }}
+SMTP_PORT = {{ smtp_port }}
+SMTP_USERNAME = {{ noreply_email_user }}
 SMTP_PASSWORD = {{ noreply_email_pass }}
-SMTP_EMAIL_FROM = infra@warpzone.ms
+SMTP_EMAIL_FROM = {{ noreply_email_user }}
 SMTP_USE_TLS = True
 SUBJECT_PREFIX = '[TEST] '
 
diff --git a/group_vars/prod b/group_vars/prod
index a9fb48e7a9e87fc14776fb4f26187d4fe62c9926..44e4dd54f106bdd865f69f9c8f0091e3a7510bd4 100644
--- a/group_vars/prod
+++ b/group_vars/prod
@@ -20,8 +20,9 @@ ldap_readonly_bind_dn: cn=readonly,dc=warpzone,dc=ms
 
 
 # SMTP Settings 
-smtp_host: smtp.warpzone.ms
-smtp_port: 25 
+smtp_domain: warpzone.ms
+smtp_host: mailserver.warpzone.ms
+smtp_port: 587 
 noreply_email_user: noreply@warpzone.ms
 
 
@@ -29,7 +30,7 @@ noreply_email_user: noreply@warpzone.ms
 mail_domains:
   warpzonems:
     maildomain: warpzone.ms 
-    mxserver: mail.warpzone.ms
+    mxserver: mailserver.warpzone.ms
     mxhostname: webserver
 
 
diff --git a/group_vars/test b/group_vars/test
index acff2065433164a2e6afb28ffc5758c6290374e3..6e9fda532eda89247f5ba99f9f9b5e493b4c4ff2 100644
--- a/group_vars/test
+++ b/group_vars/test
@@ -19,7 +19,7 @@ ldap_admin_bind_dn: cn=admin,dc=warpzone-test,dc=ms
 ldap_readonly_bind_dn: cn=readonly,dc=warpzone-test,dc=ms
 
 # SMTP Settings 
-smtp_host: smtp.warpzone.ms
-smtp_port: 25 
+smtp_host: mailserver.warpzone.ms
+smtp_port: 587 
 noreply_email_user: test-noreply-test@warpzone.ms
 
diff --git a/warpsrvint/docker_prometheus/templates/alertmanager.yml b/warpsrvint/docker_prometheus/templates/alertmanager.yml
index 102205e12bc02bdee00652f1d2d8f5580fb006d0..79e40c69e826ad82c20b185c5001ff7a16f42ed7 100644
--- a/warpsrvint/docker_prometheus/templates/alertmanager.yml
+++ b/warpsrvint/docker_prometheus/templates/alertmanager.yml
@@ -1,7 +1,7 @@
 global:
   # The smarthost and SMTP sender used for mail notifications.
-  smtp_smarthost: 'mail.warpzone.ms:25'
-  smtp_from: 'alert@warpzone.ms'
+  smtp_smarthost: '{{ smtp_host }}:{{ smtp_port }}'
+  smtp_from: '{{ noreply_email_user }}'
   # smtp_auth_username: 'alertmanager'
   # smtp_auth_password: 'password'
 
diff --git a/warpsrvint/docker_warpinfra/templates/config.ini b/warpsrvint/docker_warpinfra/templates/config.ini
index ae52584b9a87e66152fc423048d5fb8b2e352086..b96a3cc45c2a4ae0d6ad8a4979ab27d2a06c8099 100644
--- a/warpsrvint/docker_warpinfra/templates/config.ini
+++ b/warpsrvint/docker_warpinfra/templates/config.ini
@@ -39,11 +39,11 @@ LDAP_GROUP_IS_STAFF = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
 LDAP_GROUP_SUPERUSER = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
 
 [email]
-SMTP_HOST = smtp.warpzone.ms
-SMTP_PORT = 25
-SMTP_USERNAME = noreply@warpzone.ms
+SMTP_HOST = {{ smtp_host }}
+SMTP_PORT = {{ smtp_port }}
+SMTP_USERNAME = {{ noreply_email_user }}
 SMTP_PASSWORD = {{ noreply_email_pass }}
-SMTP_EMAIL_FROM = infra@warpzone.ms
+SMTP_EMAIL_FROM = {{ noreply_email_user }}
 SMTP_USE_TLS = True
 SUBJECT_PREFIX = ''
 
diff --git a/webserver/docker_gitlab/templates/conf/gitlab.rb b/webserver/docker_gitlab/templates/conf/gitlab.rb
index 4ae3a0850228d888158208a819cf4b37f2dc0ca8..370d460310a02ae5837cf637e5c920d2c959aeee 100644
--- a/webserver/docker_gitlab/templates/conf/gitlab.rb
+++ b/webserver/docker_gitlab/templates/conf/gitlab.rb
@@ -89,11 +89,11 @@ gitlab_rails['time_zone'] = 'Europe/Berlin'
 # gitlab_rails['smtp_enable_starttls_auto'] = true
 # gitlab_rails['smtp_tls'] = false
 gitlab_rails['smtp_enable'] = true
-gitlab_rails['smtp_address'] = "mail.warpzone.ms"
-gitlab_rails['smtp_port'] = 25
-gitlab_rails['smtp_user_name'] = "noreply@warpzone.ms"
+gitlab_rails['smtp_address'] = "{{ smtp_host }}"
+gitlab_rails['smtp_port'] = {{ smtp_port }}
+gitlab_rails['smtp_user_name'] = "{{ noreply_email_user }}"
 gitlab_rails['smtp_password'] = "{{ noreply_email_pass }}"
-gitlab_rails['smtp_domain'] = "warpzone.ms"
+gitlab_rails['smtp_domain'] = "{{ smtp_domain }}"
 gitlab_rails['smtp_authentication'] = "plain"
 gitlab_rails['smtp_enable_starttls_auto'] = true
 # gitlab_rails['smtp_tls'] = false
@@ -116,9 +116,9 @@ gitlab_rails['gitlab_email_enabled'] = true
 # gitlab_rails['gitlab_email_smime_key_file'] = '/etc/gitlab/ssl/gitlab_smime.key'
 # gitlab_rails['gitlab_email_smime_cert_file'] = '/etc/gitlab/ssl/gitlab_smime.crt'
 # gitlab_rails['gitlab_email_smime_ca_certs_file'] = '/etc/gitlab/ssl/gitlab_smime_cas.crt'
-gitlab_rails['gitlab_email_from'] = 'gitlab@warpzone.ms'
+gitlab_rails['gitlab_email_from'] = '{{ noreply_email_user }}'
 gitlab_rails['gitlab_email_display_name'] = 'Gitlab Warpzone'
-gitlab_rails['gitlab_email_reply_to'] = 'noreply@warpzone.ms'
+gitlab_rails['gitlab_email_reply_to'] = '{{ noreply_email_user }}'
 
 ### GitLab user privileges
 # gitlab_rails['gitlab_default_can_create_group'] = true
diff --git a/webserver/docker_mail/templates/docker-mailman/docker-compose.override.yml b/webserver/docker_mail/templates/docker-mailman/docker-compose.override.yml
index a3d35ce457b5e904f0528f92020ecb5c6e9ab855..db707dc25a71316f9e7fe56df0f47b01f64ad3b2 100644
--- a/webserver/docker_mail/templates/docker-mailman/docker-compose.override.yml
+++ b/webserver/docker_mail/templates/docker-mailman/docker-compose.override.yml
@@ -61,7 +61,7 @@ services:
       - "{{ basedir }}/docker-mailman/nginx.conf:/etc/nginx/conf.d/default.conf:ro" 
     labels:
       - traefik.enable=true
-      - traefik.http.routers.{{ servicename }}-mailman.rule=Host(`listserver.warpzone.ms`)
+      - traefik.http.routers.{{ servicename }}-mailman.rule=Host(`listserver.warpzone.ms`) || Host(`lists.warpzone.ms`)
       - traefik.http.routers.{{ servicename }}-mailman.entrypoints=websecure
       - traefik.http.services.{{ servicename }}-mailman.loadbalancer.server.port=80
     networks:
diff --git a/webserver/docker_mail/templates/mailcow-dockerized/docker-compose.override.yml b/webserver/docker_mail/templates/mailcow-dockerized/docker-compose.override.yml
index f3be3697eaaa94e93844ac7aaf1a235bffb49816..a316b94139515370b8c485fc561b0e2ff2dac6ac 100644
--- a/webserver/docker_mail/templates/mailcow-dockerized/docker-compose.override.yml
+++ b/webserver/docker_mail/templates/mailcow-dockerized/docker-compose.override.yml
@@ -27,7 +27,7 @@ services:
     nginx-mailcow:
       labels:
         - traefik.enable=true
-        - traefik.http.routers.{{ servicename }}-mailcow.rule=Host(`${MAILCOW_HOSTNAME}`)
+        - traefik.http.routers.{{ servicename }}-mailcow.rule=Host(`${MAILCOW_HOSTNAME}`) || Host(`mail.warpzone.ms`)
         - traefik.http.routers.{{ servicename }}-mailcow.entrypoints=websecure
         - traefik.http.services.{{ servicename }}-mailcow.loadbalancer.server.port=42012
       networks:
diff --git a/webserver/docker_mail/templates/mailcow-dockerized/mailcow.conf b/webserver/docker_mail/templates/mailcow-dockerized/mailcow.conf
index 26475be32bb735ccab86254a7171ddb9c646f5d6..d9a3bc902b117a591f1e029736150b21de0168d1 100644
--- a/webserver/docker_mail/templates/mailcow-dockerized/mailcow.conf
+++ b/webserver/docker_mail/templates/mailcow-dockerized/mailcow.conf
@@ -142,7 +142,7 @@ USE_WATCHDOG=y
 # Multiple rcpts allowed, NO quotation marks, NO spaces
 
 #WATCHDOG_NOTIFY_EMAIL=a@example.com,b@example.com,c@example.com
-#WATCHDOG_NOTIFY_EMAIL=
+WATCHDOG_NOTIFY_EMAIL=warpzone-server-issues@void.ms
 
 # Notify about banned IP (includes whois lookup)
 WATCHDOG_NOTIFY_BAN=n
diff --git a/webserver/docker_warpinfratest/templates/config.ini b/webserver/docker_warpinfratest/templates/config.ini
index f5a6951f65c1b5b62c1059d0436bad19bae14b68..238ac5c8b9b284361ccc47a9bd0ea48ae07343b3 100644
--- a/webserver/docker_warpinfratest/templates/config.ini
+++ b/webserver/docker_warpinfratest/templates/config.ini
@@ -39,11 +39,11 @@ LDAP_GROUP_IS_STAFF = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
 LDAP_GROUP_SUPERUSER = cn=warpauth-admin,ou=infrastructure,dc=warpzone,dc=ms
 
 [email]
-SMTP_HOST = smtp.warpzone.ms
-SMTP_PORT = 25
-SMTP_USERNAME = noreply@warpzone.ms
+SMTP_HOST = {{ smtp_host }}
+SMTP_PORT = {{ smtp_port }}
+SMTP_USERNAME = {{ noreply_email_user }}
 SMTP_PASSWORD = {{ noreply_email_pass }}
-SMTP_EMAIL_FROM = infra@warpzone.ms
+SMTP_EMAIL_FROM = {{ noreply_email_user }}
 SMTP_USE_TLS = True
 SUBJECT_PREFIX = '[TEST] '