diff --git a/roles/web-app-keycloak/config/main.yml b/roles/web-app-keycloak/config/main.yml
index 5ffd36b0..5d9f18eb 100644
--- a/roles/web-app-keycloak/config/main.yml
+++ b/roles/web-app-keycloak/config/main.yml
@@ -27,6 +27,7 @@ docker:
     keycloak:
       image:    "quay.io/keycloak/keycloak"
       version:  "latest"
+      name:     "keycloak"
     database:
       enabled: true
 
diff --git a/roles/web-app-keycloak/tasks/attributes/ssh_public_key.yml b/roles/web-app-keycloak/tasks/attributes/ssh_public_key.yml
index d4994df7..ece1c97b 100644
--- a/roles/web-app-keycloak/tasks/attributes/ssh_public_key.yml
+++ b/roles/web-app-keycloak/tasks/attributes/ssh_public_key.yml
@@ -78,5 +78,5 @@
 
 - name: Apply SSH Public Key to user-profile via kcadm
   shell: |
-    docker exec -i {{ container_name }} \
+    docker exec -i {{ keycloak_container }} \
       /opt/keycloak/bin/kcadm.sh update realms/{{ keycloak_realm }} -f {{ keycloak_docker_import_directory }}user-profile.json
diff --git a/roles/web-app-keycloak/vars/main.yml b/roles/web-app-keycloak/vars/main.yml
index 555adca8..9d88cca5 100644
--- a/roles/web-app-keycloak/vars/main.yml
+++ b/roles/web-app-keycloak/vars/main.yml
@@ -1,6 +1,6 @@
 application_id:                   "keycloak"                                                                                      # Internal CyMaIS application id 
 database_type:                    "postgres"                                                                                      # Database which will be used
-keycloak_container:               "{{ application_id }}_application"                                                              # Name of the keycloack docker container
+keycloak_container:               "{{ applications | get_app_conf(application_id, 'docker.services.keycloak.name', True) }}"      # Name of the keycloack docker container
 keycloak_host_import_directory:   "{{ docker_compose.directories.volumes }}import/"                                               # Directory in which keycloack import files are placed on the host
 keycloak_docker_import_directory: "/opt/keycloak/data/import/"                                                                    # Directory in which keycloack import files are placed in the running docker container
 keycloak_realm:                   "{{ primary_domain}}"                                                                           # This is the name of the default realm which is used by the applications