diff --git a/roles/docker-keycloak/README.md b/roles/docker-keycloak/README.md
index 2dbafc10..b26d9b6d 100644
--- a/roles/docker-keycloak/README.md
+++ b/roles/docker-keycloak/README.md
@@ -3,4 +3,5 @@
 ## More Information
 - https://www.keycloak.org/
 - https://github.com/keycloak/keycloak
-- https://en.wikipedia.org/wiki/Keycloak
\ No newline at end of file
+- https://en.wikipedia.org/wiki/Keycloak
+- https://www.keycloak.org/server/containers
\ No newline at end of file
diff --git a/roles/docker-keycloak/templates/docker-compose.yml.j2 b/roles/docker-keycloak/templates/docker-compose.yml.j2
index 3437c7b2..494c502c 100644
--- a/roles/docker-keycloak/templates/docker-compose.yml.j2
+++ b/roles/docker-keycloak/templates/docker-compose.yml.j2
@@ -6,7 +6,7 @@ services:
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}
 
   keycloak:
-    image: quay.io/keycloak/keycloak:23.0.6
+    image: quay.io/keycloak/keycloak:latest
     command: start
     environment:
       KC_HOSTNAME: {{domain}}
@@ -18,9 +18,9 @@ services:
       KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN}
       KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
       KC_DB: postgres
-      KC_DB_URL: jdbc:postgresql://postgres/${POSTGRES_DB}
-      KC_DB_USERNAME: ${POSTGRES_USER}
-      KC_DB_PASSWORD: ${POSTGRES_PASSWORD}
+      KC_DB_URL: jdbc:postgresql://{{database_host}}/{{database_name}}
+      KC_DB_USERNAME: {{database_username}}
+      KC_DB_PASSWORD: {{database_password}}
     ports:
       - "127.0.0.1:{{http_port}}:8080"
     restart: always
diff --git a/roles/docker-keycloak/vars/main.yml b/roles/docker-keycloak/vars/main.yml
new file mode 100644
index 00000000..476b12d8
--- /dev/null
+++ b/roles/docker-keycloak/vars/main.yml
@@ -0,0 +1,3 @@
+docker_compose_project_name:  	    "keycloak"
+database_type:                      "postgres"
+database_password:  	              "{{keycloak_database_password}}"
\ No newline at end of file