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 a378fd2b8ab..2fedf3436e7 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
@@ -53,9 +53,9 @@ spec:
         - name: DB_PASSWORD
           value: keycloak
         - name: KEYCLOAK_USER
-          value: admin
+          value: {{ .Values.keycloakAdminUserName }}
         - name: KEYCLOAK_PASSWORD
-          value: admin
+          value: {{ .Values.keycloakAdminUserPassword }}
         - name: CHE_HOST
           value: {{ template "cheHost" . }}
         - name: ROUTING_SUFFIX
diff --git a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/values.yaml b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/values.yaml
index f2bb0e603d7..c4823d1ced0 100644
--- a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/values.yaml
+++ b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/values.yaml
@@ -13,3 +13,5 @@
 
 image: quay.io/eclipse/che-keycloak:nightly
 requireAdminPasswordChange: true
+keycloakAdminUserName: admin
+keycloakAdminUserPassword: admin