diff --git a/group_vars/all/07_applications.yml b/group_vars/all/07_applications.yml
index 5c89d26f..2e667b7f 100644
--- a/group_vars/all/07_applications.yml
+++ b/group_vars/all/07_applications.yml
@@ -71,6 +71,9 @@ defaults_applications:
   keycloak:
     version:              "latest"
     administrator_username:  "{{administrator_username}}"  # Administrator Username for Keycloak
+#   database_password:        # Needs to be defined in inventory file   
+#   administrator_password:   # Needs to be defined in inventory file      
+
 
   ## LDAP
   ldap:
diff --git a/roles/docker-keycloak/README.md b/roles/docker-keycloak/README.md
index 4f0655be..2520ad88 100644
--- a/roles/docker-keycloak/README.md
+++ b/roles/docker-keycloak/README.md
@@ -17,32 +17,6 @@ The role integrates Keycloak with PostgreSQL as a database and supports operatio
 - Docker and Docker Compose must be installed on the target system.
 - A working NGINX proxy for forwarding requests to Keycloak (optional).
 
-## Variables ⚙️
-
-### Main Variables
-
-Defined in `vars/main.yml`:
-
-| Variable                        | Description                                                      |
-|---------------------------------|------------------------------------------------------------------|
-| `application_id`   | Name of the Docker Compose project. Default: `keycloak`.         |
-| `database_type`                 | Type of the database. Default: `postgres`.                      |
-| `database_password`             | Password for the PostgreSQL database user.                      |
-
-### Additional Variables (Templates)
-
-| Variable                        | Description                                                      |
-|---------------------------------|------------------------------------------------------------------|
-| `applications.keycloak.version`              | Version of the Keycloak image.                                  |
-| `domain`                        | Domain where Keycloak will be accessible.                       |
-| `applications.keycloak.administrator_username` | Admin username for Keycloak.                                   |
-| `keycloak_administrator_password` | Admin password for Keycloak.                                   |
-| `database_host`                 | Host of the PostgreSQL database.                                |
-| `database_name`                 | Name of the PostgreSQL database.                                |
-| `database_username`             | Username for the PostgreSQL database.                          |
-| `http_port`                     | Port where Keycloak will be accessible (default: `8080`).       |
-| `docker_restart_policy`         | Docker restart policy (e.g., `always`, `unless-stopped`).       |
-
 ## Tasks 🛠️
 
 The role performs the following main tasks:
diff --git a/roles/docker-keycloak/templates/env.j2 b/roles/docker-keycloak/templates/env.j2
index 5da95a79..e9eb7cfe 100644
--- a/roles/docker-keycloak/templates/env.j2
+++ b/roles/docker-keycloak/templates/env.j2
@@ -2,7 +2,7 @@ KC_HOSTNAME=                    https://{{domain}}
 KC_HTTP_ENABLED=                true
 KC_HEALTH_ENABLED=              true
 KEYCLOAK_ADMIN=                 "{{applications.keycloak.administrator_username}}"
-KEYCLOAK_ADMIN_PASSWORD=        "{{keycloak_administrator_password}}"
+KEYCLOAK_ADMIN_PASSWORD=        "{{applications.keycloak.administrator_password}}"
 KC_DB=                          postgres
 KC_DB_URL=                      jdbc:postgresql://{{database_host}}/{{database_name}}
 KC_DB_USERNAME=                 {{database_username}}
diff --git a/roles/docker-keycloak/vars/main.yml b/roles/docker-keycloak/vars/main.yml
index 339390c3..f492c700 100644
--- a/roles/docker-keycloak/vars/main.yml
+++ b/roles/docker-keycloak/vars/main.yml
@@ -1,4 +1,4 @@
 application_id:  	      "keycloak"
 database_type:          "postgres"
-database_password:      "{{keycloak_database_password}}"
+database_password:      "{{applications.keycloak.database_password}}"
 ldap_enabled:   True
\ No newline at end of file