diff --git a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInfraModule.java b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInfraModule.java
index 131f017dbb..c49ab1e4fb 100644
--- a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInfraModule.java
+++ b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInfraModule.java
@@ -124,7 +124,11 @@ protected void configure() {
     factories.addBinding(KubernetesEnvironment.TYPE).to(KubernetesEnvironmentFactory.class);
     factories.addBinding(Constants.NO_ENVIRONMENT_RECIPE_TYPE).to(NoEnvironmentFactory.class);
 
-    bind(KubernetesNamespaceFactory.class).to(OpenShiftProjectFactory.class);
+    String kubernetesNamespaceFactory =
+        System.getenv("CHE_INFRA_OPENSHIFT__KUBERNETES_NAMESPACE_FACTORY");
+    if (!"true".equalsIgnoreCase(kubernetesNamespaceFactory)) {
+      bind(KubernetesNamespaceFactory.class).to(OpenShiftProjectFactory.class);
+    }
     bind(KubernetesClientFactory.class).to(OpenShiftClientFactory.class);
     bind(CheServerOpenshiftClientFactory.class);