diff --git a/dockerfiles/init/modules/openshift/files/scripts/ocp.sh b/dockerfiles/init/modules/openshift/files/scripts/ocp.sh
index a6980638cae..e6b3714caff 100755
--- a/dockerfiles/init/modules/openshift/files/scripts/ocp.sh
+++ b/dockerfiles/init/modules/openshift/files/scripts/ocp.sh
@@ -75,10 +75,10 @@ export IMAGE_PULL_POLICY=${IMAGE_PULL_POLICY:-${DEFAULT_IMAGE_PULL_POLICY}}
 DEFAULT_CHE_IMAGE_REPO="eclipse/che-server"
 export CHE_IMAGE_REPO=${CHE_IMAGE_REPO:-${DEFAULT_CHE_IMAGE_REPO}}
 
-DEFAULT_IMAGE_INIT="eclipse/che-init:${CHE_IMAGE_TAG}"
+DEFAULT_IMAGE_INIT="eclipse/che-init:nightly"
 export IMAGE_INIT=${IMAGE_INIT:-${DEFAULT_IMAGE_INIT}}
 
-DEFAULT_CHE_CLI_IMAGE="eclipse/che-cli:${CHE_IMAGE_TAG}"
+DEFAULT_CHE_CLI_IMAGE="eclipse/che-cli:nightly"
 export CHE_CLI_IMAGE=${CHE_CLI_IMAGE:-${DEFAULT_CHE_CLI_IMAGE}}
 
 DEFAULT_CONFIG_DIR="/tmp/che-config"
@@ -278,7 +278,9 @@ parse_args() {
     --remove-che - remove existing che project
     ===================================
     ENV vars
-    CHE_IMAGE_TAG - set CHE images tag, default: nightly
+    CHE_IMAGE_TAG - set che-server image tag, default: nightly
+    CHE_CLI_IMAGE - set che-cli image, default: eclipse/che-cli:nightly 
+    IMAGE_INIT - set che-cli image, default: eclipse/che-init:nightly
     CHE_MULTIUSER - set CHE multi user mode, default: false (single user) 
     OC_PUBLIC_HOSTNAME - set ocp hostname to admin console, default: host ip
     OC_PUBLIC_IP - set ocp hostname for routing suffix, default: host ip