diff --git a/testserver/docker_uffd/templates/uffd.cfg b/testserver/docker_uffd/templates/uffd.cfg
index 6de25a93f469c5b409298f14cac77d15e4f84b8f..2a64ee8484eae625a0dfeeba4d8c31b9b7a00328 100644
--- a/testserver/docker_uffd/templates/uffd.cfg
+++ b/testserver/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.test-warpzone.de' 
+MAIL_SERVER='mail.warpzone.ms'
 MAIL_PORT=587
-MAIL_USERNAME='noreply-uffd@test-warpzone.de' 
+MAIL_USERNAME='uffd-test@warpzone.ms' 
 MAIL_PASSWORD='{{ uffd_mail_pass }}'
 MAIL_USE_STARTTLS=True
-MAIL_FROM_ADDRESS='noreply-uffd@test-warpzone.de'
+MAIL_FROM_ADDRESS='uffd-test@warpzone.ms'
 
 # 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 @ test-warpzone.de'
 
 # Name and contact mail address are displayed to users in a few places (plain text only!)
 ORGANISATION_NAME='test-warpzone.de'
-ORGANISATION_CONTACT='uffd@test-warpzone.de'
+ORGANISATION_CONTACT='uffd-test@warpzone.ms'
 
 # Optional text included in account registration mails (plain text only!)
 WELCOME_TEXT='See https://docs.example.com/ for further information.'