diff --git a/group_vars/all/12_iam.yml b/group_vars/all/12_iam.yml
index 19cda49b..90866c9c 100644
--- a/group_vars/all/12_iam.yml
+++ b/group_vars/all/12_iam.yml
@@ -28,8 +28,8 @@ defaults_oidc:
   attributes:
     # Attribut to identify the user
     username:             "preferred_username"
-    given_name:           "given_name"
-    family_name:          "family_name"
+    given_name:           "givenName"
+    family_name:          "surname"
     email:                "email"
 
 #############################################
diff --git a/roles/docker-keycloak/vars/configuration.yml b/roles/docker-keycloak/vars/configuration.yml
index f7ba8658..4ec98038 100644
--- a/roles/docker-keycloak/vars/configuration.yml
+++ b/roles/docker-keycloak/vars/configuration.yml
@@ -16,6 +16,8 @@ csp:
   flags:
     script-src-elem:
       unsafe-inline: true
+    script-src:
+      unsafe-inline: true
     style-src:
       unsafe-inline: true
 domains:
diff --git a/roles/docker-moodle/tasks/oidc.yml b/roles/docker-moodle/tasks/oidc.yml
index b8555463..07adaa22 100644
--- a/roles/docker-moodle/tasks/oidc.yml
+++ b/roles/docker-moodle/tasks/oidc.yml
@@ -34,7 +34,10 @@
     - { name: "logouturi",            value: "{{ oidc.client.logout_url }}" }
     - { name: "icon",                 value: "moodle:t/lock" }
     - { name: "field_map_firstname",  value: "{{ oidc.attributes.given_name }}" }
+    - { name: "field_lock_firstname", value: "locked" }
     - { name: "field_map_lastname",   value: "{{ oidc.attributes.family_name }}" }
+    - { name: "field_lock_lastname",  value: "locked" }
+    - { name: "field_map_email",      value: "locked" }
     #- { name: "showloginform",        value: 0 }  # Deactivate if OIDC is active
     - { name: "alternateloginurl",    value: "{{ web_protocol }}://{{ domains | get_domain(application_id) }}/auth/oidc/" }
   loop_control:
diff --git a/roles/docker-pgadmin/meta/main.yml b/roles/docker-pgadmin/meta/main.yml
index fb167e7c..54084633 100644
--- a/roles/docker-pgadmin/meta/main.yml
+++ b/roles/docker-pgadmin/meta/main.yml
@@ -26,3 +26,4 @@ galaxy_info:
     class: "fa-solid fa-database"
   run_after:
     - docker-matomo
+    - docker-keycloak
diff --git a/roles/docker-phpldapadmin/meta/main.yml b/roles/docker-phpldapadmin/meta/main.yml
index 8fa63224..dfd4c75b 100644
--- a/roles/docker-phpldapadmin/meta/main.yml
+++ b/roles/docker-phpldapadmin/meta/main.yml
@@ -26,3 +26,4 @@ galaxy_info:
   run_after:
     - docker-ldap
     - docker-matomo
+    - docker-keycloak
diff --git a/roles/docker-phpmyadmin/meta/main.yml b/roles/docker-phpmyadmin/meta/main.yml
index 3b2df9c7..56fdb050 100644
--- a/roles/docker-phpmyadmin/meta/main.yml
+++ b/roles/docker-phpmyadmin/meta/main.yml
@@ -27,4 +27,5 @@ galaxy_info:
     class: "fa-solid fa-database"
   run_after:
     - docker-mariadb
-    - docker-matomo
\ No newline at end of file
+    - docker-matomo
+    - docker-keycloak
\ No newline at end of file
diff --git a/roles/docker-taiga/meta/main.yml b/roles/docker-taiga/meta/main.yml
index fb51d9b0..bc4952ff 100644
--- a/roles/docker-taiga/meta/main.yml
+++ b/roles/docker-taiga/meta/main.yml
@@ -28,4 +28,7 @@ galaxy_info:
   documentation: "https://s.veen.world/cymais"
   logo:
     class: "fa-solid fa-tasks"
-dependencies: []
+  run_after:
+    - docker-postgres
+    - docker-matomo
+    - docker-keycloak
diff --git a/roles/docker-yourls/meta/main.yml b/roles/docker-yourls/meta/main.yml
index 3685ae3c..7e6dcaca 100644
--- a/roles/docker-yourls/meta/main.yml
+++ b/roles/docker-yourls/meta/main.yml
@@ -25,4 +25,7 @@ galaxy_info:
   documentation: "https://s.veen.world/cymais"
   logo:
     class: "fa-solid fa-link"
-dependencies: []
\ No newline at end of file
+  run_after:
+    - docker-mariadb
+    - docker-matomo
+    - docker-keycloak
\ No newline at end of file