diff --git a/deploy/kubernetes/helm/che/templates/configmap.yaml b/deploy/kubernetes/helm/che/templates/configmap.yaml
index 8dcbc1d3eefc998dd7c2f51c3f3d96bc94be53f2..e4ce845e5b6a3cb6219fdb84304acbf56f0b496d 100644
--- a/deploy/kubernetes/helm/che/templates/configmap.yaml
+++ b/deploy/kubernetes/helm/che/templates/configmap.yaml
@@ -30,7 +30,7 @@ data:
   CHE_DEBUG_SERVER: "true"
   CHE_INFRASTRUCTURE_ACTIVE: "kubernetes"
   CHE_INFRA_KUBERNETES_INGRESS_DOMAIN: {{ .Values.global.ingressDomain }}
-  CHE_INFRA_KUBERNETES_MACHINE__START__TIMEOUT__MIN: "5"
+  CHE_INFRA_KUBERNETES_WORKSPACE__START__TIMEOUT__MIN: "5"
   CHE_INFRA_KUBERNETES_MASTER__URL: ""
 {{- if and .Values.global.tls .Values.global.tls.enabled }}
   CHE_INFRA_KUBERNETES_TLS__ENABLED: {{ .Values.global.tls.enabled | quote}}
diff --git a/deploy/openshift/templates/che-server-template.yaml b/deploy/openshift/templates/che-server-template.yaml
index 6e626538d29c5981854b4e2b89abad2a6c547375..c6e1b3514fd1c702f3eb779ac0a545aa5b95dae9 100644
--- a/deploy/openshift/templates/che-server-template.yaml
+++ b/deploy/openshift/templates/che-server-template.yaml
@@ -104,7 +104,7 @@ objects:
             value: "openshift"
           - name: CHE_INFRA_KUBERNETES_BOOTSTRAPPER_BINARY__URL
             value: "${PROTOCOL}://che-${NAMESPACE}.${ROUTING_SUFFIX}/agent-binaries/linux_amd64/bootstrapper/bootstrapper"
-          - name: CHE_INFRA_KUBERNETES_MACHINE__START__TIMEOUT__MIN
+          - name: CHE_INFRA_KUBERNETES_WORKSPACE__START__TIMEOUT__MIN
             value: "5"
           - name: CHE_INFRA_KUBERNETES_MASTER__URL
             value: "${CHE_INFRA_KUBERNETES_MASTER__URL}"
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 411c9fa410aaf1d735ddce0c16d751c586cfb1a0..c0ce37db46448737956bb7e7ba7e6485b06579a4 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
@@ -87,8 +87,6 @@ spec:
             - name: CHE_INFRA_KUBERNETES_BOOTSTRAPPER_BINARY__URL
               value: >-
                 http://che-${NAMESPACE}.172.0.0.1.nip.io/agent-binaries/linux_amd64/bootstrapper/bootstrapper
-            - name: CHE_INFRA_KUBERNETES_MACHINE__START__TIMEOUT__MIN
-              value: '5'
             - name: CHE_INFRA_KUBERNETES_OAUTH__TOKEN
             - name: CHE_INFRA_KUBERNETES_USERNAME
             - name: CHE_INFRA_KUBERNETES_PASSWORD