diff --git a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/deployment.yaml b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/deployment.yaml
index fcb947b223d..f0b875ed471 100644
--- a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/deployment.yaml
+++ b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/deployment.yaml
@@ -36,15 +36,17 @@ spec:
             value: postgres
       containers:
       - env:
-        - name: POSTGRES_PORT_5432_TCP_ADDR
+        - name: DB_VENDOR
+          value: POSTGRES
+        - name: DB_ADDR
           value: postgres
-        - name: POSTGRES_PORT_5432_TCP_PORT
+        - name: DB_PORT
           value: "5432"
-        - name: POSTGRES_DATABASE
+        - name: DB_DATABASE
           value: keycloak
-        - name: POSTGRES_USER
+        - name: DB_USER
           value: keycloak
-        - name: POSTGRES_PASSWORD
+        - name: DB_PASSWORD
           value: keycloak
         - name: KEYCLOAK_USER
           value: admin
diff --git a/deploy/openshift/templates/multi/keycloak-template.yaml b/deploy/openshift/templates/multi/keycloak-template.yaml
index 06df2cc4ba6..112940aaab2 100644
--- a/deploy/openshift/templates/multi/keycloak-template.yaml
+++ b/deploy/openshift/templates/multi/keycloak-template.yaml
@@ -38,15 +38,17 @@ objects:
                 fieldPath: metadata.namespace
           - name: PROXY_ADDRESS_FORWARDING
             value: "true"
-          - name: POSTGRES_PORT_5432_TCP_ADDR
+          - name: DB_VENDOR
+            value: POSTGRES
+          - name: DB_ADDR
             value: postgres
-          - name: POSTGRES_PORT_5432_TCP_PORT
+          - name: DB_PORT
             value: "5432"
-          - name: POSTGRES_DATABASE
+          - name: DB_DATABASE
             value: keycloak
-          - name: POSTGRES_USER
+          - name: DB_USER
             value: keycloak
-          - name: POSTGRES_PASSWORD
+          - name: DB_PASSWORD
             value: keycloak
           - name: KEYCLOAK_USER
             value: "${KEYCLOAK_USER}"
diff --git a/dockerfiles/keycloak/kc_realm_user.sh b/dockerfiles/keycloak/kc_realm_user.sh
index ebf7febf85f..53b64c31b80 100755
--- a/dockerfiles/keycloak/kc_realm_user.sh
+++ b/dockerfiles/keycloak/kc_realm_user.sh
@@ -40,10 +40,14 @@ if [ "${CHE_SELF__SIGNED__CERT}" != "" ]; then
     /opt/jboss/keycloak/bin/jboss-cli.sh --file=/scripts/cli/add_openshift_certificate.cli && rm -rf /opt/jboss/keycloak/standalone/configuration/standalone_xml_history
 fi
 
+# POSTGRES_PORT is assigned by Kubernetes controller
+# and it isn't fit to docker-entrypoin.sh.
+unset POSTGRES_PORT
+
 echo "Starting Keycloak server..."
 
-/opt/jboss/keycloak/bin/standalone.sh -Dkeycloak.migration.action=import \
-                                      -Dkeycloak.migration.provider=dir \
-                                      -Dkeycloak.migration.strategy=IGNORE_EXISTING \
-                                      -Dkeycloak.migration.dir=/scripts/ \
-                                      -Djboss.bind.address=0.0.0.0
+exec /opt/jboss/docker-entrypoint.sh -Dkeycloak.migration.action=import \
+                                     -Dkeycloak.migration.provider=dir \
+                                     -Dkeycloak.migration.strategy=IGNORE_EXISTING \
+                                     -Dkeycloak.migration.dir=/scripts/ \
+                                     -Djboss.bind.address=0.0.0.0