diff --git a/group_vars/all/versions.yml b/group_vars/all/versions.yml
index 437fe54..69f3a14 100644
--- a/group_vars/all/versions.yml
+++ b/group_vars/all/versions.yml
@@ -13,7 +13,7 @@ prom_grafana_version: "9.1.5"
 
 harbor_version: "v2.4.1"
 
-keycloak_version: "14.0.0.4"
+keycloak_version: "20.0.2.1"
 
 pgadmin4_version: "6.14"
 
diff --git a/roles/keycloak/vars/main.yml b/roles/keycloak/vars/main.yml
index a199172..2797f3c 100644
--- a/roles/keycloak/vars/main.yml
+++ b/roles/keycloak/vars/main.yml
@@ -26,19 +26,16 @@ keycloak_docker: {
       image_name: "{{ keycloak_image }}",
       image_version: "{{ keycloak_version }}",
       labels: "{{ keycloak_labels + ( keycloak_labels_additional | default([])) }}",
+      command: "start",
       environment: [
-        "PROXY_ADDRESS_FORWARDING: \"true\"",
-
         "KEYCLOAK_USER: \"{{ keycloak_admin_username }}\"",
-        "KEYCLOAK_PASSWORD: \"{{ keycloak_admin_password }}\"",
-
-        "DB_VENDOR: postgres",
-        "DB_DATABASE: \"{{ keycloak_postgres_database }}\"",
-        "DB_USER: \"{{ keycloak_postgres_username }}\"",
-        "DB_PASSWORD: \"{{ keycloak_postgres_password }}\"",
-        "DB_ADDR: \"{{ keycloak_postgres_host }}\"",
-        "JDBC_PARAMS: \"sslmode=require\"",
-        "JAVA_OPTS_APPEND: \"-Dkeycloak.profile.feature.docker=enabled\"",
+        "KEYCLOAK_ADMIN_PASSWORD: \"{{ keycloak_admin_password }}\"",
+        "KC_PROXY: \"edge\"",
+        "KC_HOSTNAME: \"{{ stage_server_domain }}\"",
+        "KC_DB: \"postgres\"",
+        "KC_DB_USERNAME: \"{{ keycloak_postgres_username }}\"",
+        "KC_DB_PASSWORD: \"{{ keycloak_postgres_password }}\"",
+        "KC_DB_URL: \"jdbc:postgresql://{{ shared_service_postgres_01_hostname }}:{{ service_port_postgres }}/{{ keycloak_postgres_database }}?sslmode=require\""
       ],
       networks: [
         '"front-tier"',
diff --git a/templates/_docker/docker-compose.yml.j2 b/templates/_docker/docker-compose.yml.j2
index 67c6eb1..6edd9d5 100644
--- a/templates/_docker/docker-compose.yml.j2
+++ b/templates/_docker/docker-compose.yml.j2
@@ -50,11 +50,15 @@ services:
   service.command is defined
   and (service.command|length>0)
 %}
+{% if service.command is string %}
+    command: "{{ service.command }}"
+{% elif service.command is iterable %}
     command: [
 {% for item in service.command %}
-      {{ item }},
+    {{ item }},
 {% endfor %}
-    ]
+      ]
+{% endif %}
 {% endif %}
 {# ########################################## command #}
 {# ###################################### labels #}
@@ -167,4 +171,4 @@ services:
 {% endif %}
 {# ########################################### lines #}
 {% endfor %}
-{# ################################################## services #}
\ No newline at end of file
+{# ################################################## services #}