diff --git a/deploy/openshift/templates/che-server-template.yaml b/deploy/openshift/templates/che-server-template.yaml
index 713af8fed6..63677cd012 100644
--- a/deploy/openshift/templates/che-server-template.yaml
+++ b/deploy/openshift/templates/che-server-template.yaml
@@ -149,11 +149,11 @@ objects:
             value: "${CHE_WORKSPACE_SIDECAR_DEFAULT__MEMORY__LIMIT__MB}"
           - name: ROUTING_SUFFIX
             value: "${ROUTING_SUFFIX}"
-          - name: OPENSHIFT_IDENTITY_PROVIDER_CERTIFICATE
+          - name: CHE_SELF__SIGNED__CERT
             valueFrom:
               secretKeyRef:
                 key: ca.crt
-                name: openshift-identity-provider
+                name: self-signed-certificate
                 optional: true
           - name: CHE_WORKSPACE_PLUGIN__REGISTRY__URL
             value: "${CHE_WORKSPACE_PLUGIN__REGISTRY__URL}"
diff --git a/deploy/openshift/templates/multi/keycloak-template.yaml b/deploy/openshift/templates/multi/keycloak-template.yaml
index a135cb1096..06df2cc4ba 100644
--- a/deploy/openshift/templates/multi/keycloak-template.yaml
+++ b/deploy/openshift/templates/multi/keycloak-template.yaml
@@ -58,11 +58,11 @@ objects:
             value: "${ROUTING_SUFFIX}"
           - name: CHE_KEYCLOAK_ADMIN_REQUIRE_UPDATE_PASSWORD
             value: "${CHE_KEYCLOAK_ADMIN_REQUIRE_UPDATE_PASSWORD}"
-          - name: OPENSHIFT_IDENTITY_PROVIDER_CERTIFICATE
+          - name: CHE_SELF__SIGNED__CERT
             valueFrom:
               secretKeyRef:
                 key: ca.crt
-                name: openshift-identity-provider
+                name: self-signed-certificate
                 optional: true
           image: '${IMAGE_KEYCLOAK}:${KEYCLOAK_IMAGE_TAG}'
           command: ["/scripts/kc_realm_user.sh"]
diff --git a/deploy/openshift/templates/multi/openshift-certificate-secret.yaml b/deploy/openshift/templates/multi/openshift-certificate-secret.yaml
index 026f8cbd9e..cd6674aaca 100644
--- a/deploy/openshift/templates/multi/openshift-certificate-secret.yaml
+++ b/deploy/openshift/templates/multi/openshift-certificate-secret.yaml
@@ -11,7 +11,7 @@
 kind: Template
 apiVersion: v1
 metadata:
-  name: openshift-identity-provider-certificate
+  name: self-signed-certificate
   annotations:
     description: Che
 objects:
@@ -21,12 +21,11 @@ objects:
       ${CERTIFICATE}
   kind: Secret
   metadata:
-    name: openshift-identity-provider
+    name: self-signed-certificate
     namespace: che
   type: Opaque
 parameters:
 - name: CERTIFICATE
   displayName: Openshift console certificate
 labels:
-  app: keycloak
-  template: openshift-identity-provider-certificate
+  template: self-signed-certificate
diff --git a/dockerfiles/che/entrypoint.sh b/dockerfiles/che/entrypoint.sh
index 6cebe8f103..b66f3e3f17 100755
--- a/dockerfiles/che/entrypoint.sh
+++ b/dockerfiles/che/entrypoint.sh
@@ -283,9 +283,9 @@ init() {
 
 add_cert_to_truststore() {
 
-    if [ "${OPENSHIFT_IDENTITY_PROVIDER_CERTIFICATE}" != "" ]; then
+    if [ "${CHE_SELF__SIGNED__CERT}" != "" ]; then
         echo "Found a custom cert. Adding it to java trust store..."
-        echo "${OPENSHIFT_IDENTITY_PROVIDER_CERTIFICATE}" > /home/user/openshift.crt
+        echo "${CHE_SELF__SIGNED__CERT}" > /home/user/openshift.crt
         echo yes | keytool -keystore /home/user/openshift.jks -importcert -alias HOSTDOMAIN -file /home/user/openshift.crt -storepass minishift
         export JAVA_OPTS="${JAVA_OPTS} -Djavax.net.ssl.trustStore=/home/user/openshift.jks -Djavax.net.ssl.trustStorePassword=minishift"
     fi
diff --git a/dockerfiles/keycloak/kc_realm_user.sh b/dockerfiles/keycloak/kc_realm_user.sh
index 040af75f8d..ebf7febf85 100755
--- a/dockerfiles/keycloak/kc_realm_user.sh
+++ b/dockerfiles/keycloak/kc_realm_user.sh
@@ -33,8 +33,8 @@ if [ $KEYCLOAK_USER ] && [ $KEYCLOAK_PASSWORD ]; then
     /opt/jboss/keycloak/bin/add-user-keycloak.sh --user $KEYCLOAK_USER --password $KEYCLOAK_PASSWORD
 fi
 
-if [ "${OPENSHIFT_IDENTITY_PROVIDER_CERTIFICATE}" != "" ]; then
-    echo "${OPENSHIFT_IDENTITY_PROVIDER_CERTIFICATE}" > /scripts/openshift.cer
+if [ "${CHE_SELF__SIGNED__CERT}" != "" ]; then
+    echo "${CHE_SELF__SIGNED__CERT}" > /scripts/openshift.cer
     keytool -importcert -alias HOSTDOMAIN -keystore /scripts/openshift.jks -file /scripts/openshift.cer -storepass openshift -noprompt
     keytool -importkeystore -srckeystore $JAVA_HOME/jre/lib/security/cacerts -destkeystore /scripts/openshift.jks -srcstorepass changeit -deststorepass openshift
     /opt/jboss/keycloak/bin/jboss-cli.sh --file=/scripts/cli/add_openshift_certificate.cli && rm -rf /opt/jboss/keycloak/standalone/configuration/standalone_xml_history
diff --git a/selenium/che-selenium-test/src/test/resources/projects/nodejs-with-yaml/deployment.yaml b/selenium/che-selenium-test/src/test/resources/projects/nodejs-with-yaml/deployment.yaml
index e2913e9b2b..411c9fa410 100644
--- a/selenium/che-selenium-test/src/test/resources/projects/nodejs-with-yaml/deployment.yaml
+++ b/selenium/che-selenium-test/src/test/resources/projects/nodejs-with-yaml/deployment.yaml
@@ -127,11 +127,11 @@ spec:
               value: http
             - name: ROUTING_SUFFIX
               value: 172.19.20.234.nip.io
-            - name: OPENSHIFT_IDENTITY_PROVIDER_CERTIFICATE
+            - name: CHE_SELF__SIGNED__CERT
               valueFrom:
                 secretKeyRef:
                   key: ca.crt
-                  name: openshift-identity-provider
+                  name: self-signed-certificate
                   optional: true
             - name: CHE_WORKSPACE_PLUGIN__REGISTRY__URL
               value: 'NULL'