diff --git a/roles/keycloak/tasks/main.yml b/roles/keycloak/tasks/main.yml
index 9bb4c39..97276c5 100644
--- a/roles/keycloak/tasks/main.yml
+++ b/roles/keycloak/tasks/main.yml
@@ -93,7 +93,7 @@
     - create_groups
     - update_realms
 
-- name: Print realm users
+- name: "Printing master realm access_token"
   debug:
     msg: "{{ keycloak_authentication.json.access_token }}"
   tags:
@@ -101,6 +101,40 @@
   when:
     - debug
 
+- name: "Setting smardigo-theme for master realm"
+  community.general.keycloak_realm:
+    id: "master"
+    realm: "master"
+    auth_realm: "master"
+    auth_client_id: "admin-cli"
+    auth_username: "{{ keycloak_admin_username }}"
+    auth_password: "{{ keycloak_admin_password }}"
+    auth_keycloak_url: "{{ keycloak_server_url }}/auth"
+    account_theme: "smardigo-theme"
+    admin_theme: "smardigo-theme"
+    login_theme: "smardigo-theme"
+    registration_allowed: no
+    reset_password_allowed: no
+    login_with_email_allowed: no
+    duplicate_emails_allowed: yes
+    internationalization_enabled: yes
+    default_locale: "de"
+    supported_locales:
+    - "de"
+    - "en"
+    events_enabled: yes
+    events_expiration: 604800
+    admin_events_enabled: yes
+    smtp_server:
+      host: "{{ shared_service_mail_hostname }}"
+      from: "{{ keycloak_id }}@smardigo.digital"
+    events_listeners:
+    - "jboss-logging"
+    - "metrics-listener"
+    state: present
+  tags:
+    - update_realms
+
 - name: "Setup realms"
   include_tasks: configure_realm.yml
   vars:
@@ -136,32 +170,11 @@
     - create_groups
     - update_realms
 
-- name: "Activate event listeners"
-  shell: |
-    docker exec {{ keycloak_id }} /bin/sh -c "/opt/jboss/keycloak/bin/kcadm.sh config credentials --server http://localhost:8080/auth --realm master --user $KEYCLOAK_USER --password $KEYCLOAK_PASSWORD"
-    docker exec {{ keycloak_id }} /bin/sh -c "/opt/jboss/keycloak/bin/kcadm.sh update events/config -s 'eventsEnabled=true' -s 'adminEventsEnabled=true' -s 'eventsListeners+=metrics-listener'"
-    docker exec {{ keycloak_id }} /bin/sh -c "usr/bin/rm -f /opt/jboss/.keycloak/kcadm.config"
-  tags:
-    - update_deployment
-    - configure_container
-
-- name: "Set smardigo-theme for master realm"
-  community.general.keycloak_realm:
-    auth_client_id: admin-cli
-    auth_keycloak_url: "http://localhost:8110/auth"
-    auth_realm: master
-    auth_username: "{{ keycloak_admin_username }}"
-    auth_password: "{{ keycloak_admin_password }}"
-    id: master
-    account_theme: "smardigo-theme"
-    admin_theme: "smardigo-theme"
-    login_theme: "smardigo-theme"
-    realm: "master"
-    state: present
-  tags:
-    - update_realms
-
-
-
-  
-
+#- name: "Activate event listeners"
+#  shell: |
+#    docker exec {{ keycloak_id }} /bin/sh -c "/opt/jboss/keycloak/bin/kcadm.sh config credentials --server http://localhost:8080/auth --realm master --user $KEYCLOAK_USER --password $KEYCLOAK_PASSWORD"
+#    docker exec {{ keycloak_id }} /bin/sh -c "/opt/jboss/keycloak/bin/kcadm.sh update events/config -s 'eventsEnabled=true' -s 'adminEventsEnabled=true' -s 'eventsListeners+=metrics-listener'"
+#    docker exec {{ keycloak_id }} /bin/sh -c "usr/bin/rm -f /opt/jboss/.keycloak/kcadm.config"
+#  tags:
+#    - update_deployment
+#    - configure_container