diff --git a/group_vars/all/plain.yml b/group_vars/all/plain.yml
index c028a1b..7dfd151 100644
--- a/group_vars/all/plain.yml
+++ b/group_vars/all/plain.yml
@@ -71,8 +71,11 @@ docker_owner: "{{ admin_user }}"
 docker_group: "{{ admin_user }}"
 service_base_path: '/etc/smardigo'
 
-# TODO we need a company email address
+# TODO we need a company email addresses
 lets_encrypt_email: "sven.ketelsen@netgo.de"
+docker_admin_email: "sven.ketelsen@netgo.de"
+connect_admin_email: "sven.ketelsen@netgo.de"
+keycloak_admin_email: "sven.ketelsen@netgo.de"
 
 http_port: "80"
 https_port: "443"
diff --git a/group_vars/keycloak/plain.yml b/group_vars/keycloak/plain.yml
index 27d9169..ee16414 100644
--- a/group_vars/keycloak/plain.yml
+++ b/group_vars/keycloak/plain.yml
@@ -20,7 +20,7 @@ keycloak: {
         {
           "username": "docker-admin",
           "password": "docker-admin",
-          "email": "docker@smardigo.digital",
+          "email": "{{ docker_admin_email }}",
         }
       ],
       groups: [
@@ -65,7 +65,7 @@ keycloak: {
         {
           "username": "connect-admin",
           "password": "connect-admin",
-          "email": "connect@smardigo.digital",
+          "email": "{{ connect_admin_email }}",
         }
       ],
       clients: [
diff --git a/group_vars/stage_qa/plain.yml b/group_vars/stage_qa/plain.yml
index f1dc1bd..1189442 100644
--- a/group_vars/stage_qa/plain.yml
+++ b/group_vars/stage_qa/plain.yml
@@ -149,7 +149,7 @@ smardigo_management_oidc_realm: "smardigo"
 smardigo_management_oidc_client_id: "management-smardigo"
 
 smardigo_management_url: "{{ http_s }}://{{ management_service_connect_hostname }}/api/v1/scopes/{{ scope_id }}/processes/{{ process_instance_id }}/messages"
-smardigo_management_token: "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..rCRO1cVFgkyZ45D5cJNK5g.fc6JVOo5ja5sqe-0PQTfJGOivJ6tyiD-rwgY6rXJ3-U.tOgqgJ2zTjB3_M9BGtvVjQ"
+smardigo_management_token: "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..ynbVHutFvwcnzGNpUrObEA.2kHkShTJHDQIRY5QVmwrC-pQOasbQeHb33L5W4wWDdw.OVghXkhWdkps0YYEomO-pg"
 
 connect_element_template_enabled: "true"
 connect_external_task_script_worker_enabled: "true"
diff --git a/roles/keycloak/templates/keycloak-realm-create.json.j2 b/roles/keycloak/templates/keycloak-realm-create.json.j2
index 5580378..38ec367 100644
--- a/roles/keycloak/templates/keycloak-realm-create.json.j2
+++ b/roles/keycloak/templates/keycloak-realm-create.json.j2
@@ -96,7 +96,7 @@
   },
   "smtpServer": {
     "host": "{{ shared_service_mail_hostname }}",
-    "from": "{{ inventory_hostname }}@{{ shared_service_mail_hostname }}"
+    "from": "{{ current_realm_name }}.{{ inventory_hostname }}@{{ domain }}"
   },
   "loginTheme": "smardigo-theme",
   "accountTheme": "smardigo-theme",