diff --git a/etc/k8s/eshoponabp/charts/keycloak/templates/keycloak-deployment.yaml b/etc/k8s/eshoponabp/charts/keycloak/templates/keycloak-deployment.yaml
index 8dc63177..ad2d68ed 100644
--- a/etc/k8s/eshoponabp/charts/keycloak/templates/keycloak-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/keycloak/templates/keycloak-deployment.yaml
@@ -14,30 +14,49 @@ spec:
       containers:
       - image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        command: ["/opt/keycloak/bin/kc.sh", "start", "--optimized", "--http-enabled=true", "--http-port=8080", "--hostname-strict=false", "--hostname-strict-https=false"]
+        args: ["start", "--cache-stack=kubernetes"]
         name: {{ .Release.Name }}-{{ .Chart.Name }}
         ports:
         - name: http
-          containerPort: 80
+          containerPort: 8080
         - name: https
-          containerPort: 443
-        env:
-        - name: DB_VENDOR
-          value: "{{ .Values.config.dbVendor }}"
-        - name: DB_ADDR
-          value: "{{ .Values.config.dbAddr }}"        
-        - name: DB_DATABASE
-          value: "{{ .Values.config.dbDatabase }}"
-        - name: "DB_USER"
-          value: "{{ .Values.config.dbUser }}"
-        - name: "DB_PASSWORD"
-          value: "{{ .Values.config.dbPassword }}"
+          containerPort: 8443
+        env:      
+        - name: "KC_DB"
+          value: "{{ .Values.config.kcDb }}"
+        - name: "KC_DB_URL"
+          value: "{{ .Values.config.kcDbUrl }}"
+        - name: "KC_DB_URL_HOST"
+          value: "{{ .Values.config.kcDbUrlHost }}"
+        - name: "KC_DB_URL_PORT"
+          value: "{{ .Values.config.kcDbUrlPort }}"
+        - name: "KC_DB_URL_DATABASE"
+          value: "{{ .Values.config.kcDbUrlDatabase }}"
+        - name: "KC_DB_USERNAME"
+          value: "{{ .Values.config.kcDbUsername }}"
+        - name: "KC_DB_PASSWORD"
+          value: "{{ .Values.config.kcDbPassword }}"
         - name: "KEYCLOAK_ADMIN"
           value: "{{ .Values.config.keycloakAdmin }}"
         - name: "KEYCLOAK_ADMIN_PASSWORD"
           value: "{{ .Values.config.keycloakAdminPassword }}"
         - name: "KC_HEALTH_ENABLED"
           value: "{{ .Values.config.kcHealthEnabled }}"
+        - name: "KC_HTTP_RELATIVE_PATH"
+          value: "{{ .Values.config.kcHttpRelativePath }}"
+        - name: "KC_PROXY"
+          value: "{{ .Values.config.kcProxy }}"
+        - name: "PROXY_ADDRESS_FORWARDING"
+          value: "{{ .Values.config.proxyAddressForwarding }}"
+        - name: "KC_HTTP_ENABLED"
+          value: "{{ .Values.config.kcHttpEnabled }}"
+        - name: "KC_HOSTNAME_URL"
+          value: "{{ .Values.config.kcHostnameUrl }}"
+        - name: "KC_HOSTNAME_ADMIN_URL"
+          value: "{{ .Values.config.kcHostnameAdminUrl }}"
+        - name: "jgroups.dns.query"
+          value: "{{ .Values.config.jgroupsDnsQuery }}"
+        
           {{- if .Values.env }}
 {{ toYaml .Values.env | indent 8 }}
           {{- end }}
diff --git a/etc/k8s/eshoponabp/charts/keycloak/values.yaml b/etc/k8s/eshoponabp/charts/keycloak/values.yaml
index ba735123..79a4e9f8 100644
--- a/etc/k8s/eshoponabp/charts/keycloak/values.yaml
+++ b/etc/k8s/eshoponabp/charts/keycloak/values.yaml
@@ -1,12 +1,21 @@
 config:
-  dbVendor: postgres
-  dbAddr: eshop-st-postgresdb
-  dbDatabase: keycloak
-  dbUser: postgres
-  dbPassword: myPassw0rd
+  kcDb: postgres
+  kcDbUrl: jdbc:postgresql://eshop-st-postgresdb:5432/keycloak
+  kcDbUrlHost: eshop-st-postgresdb
+  kcDbUrlPort: 5432
+  kcDbUrlDatabase: keycloak
+  kcDbUsername: postgres
+  kcDbPassword: myPassw0rd
   keycloakAdmin: admin
   keycloakAdminPassword: 1q2w3E*
   kcHealthEnabled: true
+  kcHttpRelativePath : /
+  kcProxy: edge
+  proxyAddressForwarding: true
+  kcHttpEnabled: true
+  kcHostnameUrl: https://account.eshoponabp.dev
+  kcHostnameAdminUrl: https://account.eshoponabp.dev
+  jgroupsDnsQuery: eshop-st-keycloak
 
 ingress:
   host: account.eshoponabp.dev
@@ -14,7 +23,7 @@ ingress:
 
 image:
   repository: quay.io/keycloak/keycloak
-  tag: 19.0.2
+  tag: 21.1.1
   pullPolicy: IfNotPresent
 
 # command:
diff --git a/etc/k8s/eshoponabp/charts/postgres/templates/postgres-deployment.yaml b/etc/k8s/eshoponabp/charts/postgres/templates/postgres-deployment.yaml
index a86da72b..073b6928 100644
--- a/etc/k8s/eshoponabp/charts/postgres/templates/postgres-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/postgres/templates/postgres-deployment.yaml
@@ -28,6 +28,8 @@ spec:
           env:
           - name: POSTGRES_PASSWORD
             value: "myPassw0rd"
+          - name: POSTGRES_DB
+            value: "keycloak"
 {{- if eq .Release.Name "eshop-az" }}
   volumeClaimTemplates:
   - metadata:
diff --git a/etc/k8s/eshoponabp/values.st.yaml b/etc/k8s/eshoponabp/values.st.yaml
index 992033d7..58aa1d10 100644
--- a/etc/k8s/eshoponabp/values.st.yaml
+++ b/etc/k8s/eshoponabp/values.st.yaml
@@ -1,20 +1,30 @@
 # auth-server sub-chart override
 keycloak:
   config:
-    dbVendor: postgres
-    dbAddr: eshop-st-postgresdb
-    dbDatabase: keycloak
-    dbUser: postgres
-    dbPassword: myPassw0rd
+    kcDb: postgres
+    kcDbUrl: jdbc:postgresql://eshop-st-postgresdb:5432/keycloak
+    kcDbUrlHost: eshop-st-postgresdb
+    kcDbUrlPort: 5432
+    kcDbUrlDatabase: keycloak
+    kcDbUsername: postgres
+    kcDbPassword: myPassw0rd
     keycloakAdmin: admin
     keycloakAdminPassword: 1q2w3E*
     kcHealthEnabled: true
+    kcHttpRelativePath : /
+    kcProxy: edge
+    proxyAddressForwarding: true
+    kcHttpEnabled: true
+    kcHostnameUrl: https://account.eshoponabp.dev
+    kcHostnameAdminUrl: https://account.eshoponabp.dev
+    jgroupsDnsQuery: eshop-st-keycloak
+
   ingress:
     host: account.eshoponabp.dev
     tlsSecret: eshop-wildcard-tls
   image:
     repository: quay.io/keycloak/keycloak
-    tag: 19.0.2
+    tag: 21.1.1
     pullPolicy: IfNotPresent
 
 # web sub-chart override