diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties
index c7cf3179da6..c71263f26d8 100644
--- a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties
+++ b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties
@@ -645,7 +645,7 @@ che.wsagent.cors.enabled=true
 che.factory.default_editor=eclipse/che-theia/7.0.0-next
 # multiple plugins must be comma-separated, for example:
 # pluginFooPublisher/pluginFooName/pluginFooVersion,pluginBarPublisher/pluginBarName/pluginBarVersion
-che.factory.default_plugins=eclipse/che-machine-exec-plugin/0.0.1
+che.factory.default_plugins=eclipse/che-machine-exec-plugin/next
 
 ## Devfile settings
 
@@ -662,4 +662,4 @@ che.workspace.devfile.default_editor=eclipse/che-theia/7.0.0-next
 # the same as the default one (even if in different version).
 # Format is comma-separated `pluginPublisher/pluginName/pluginVersion` values, for example
 # eclipse/che-theia-exec-plugin/0.0.1,eclipse/che-theia-terminal-plugin/0.0.1
-che.workspace.devfile.default_editor.plugins=eclipse/che-machine-exec-plugin/0.0.1
+che.workspace.devfile.default_editor.plugins=eclipse/che-machine-exec-plugin/next
diff --git a/deploy/openshift/deploy_che.sh b/deploy/openshift/deploy_che.sh
index 554f3791b5c..be4620d7247 100755
--- a/deploy/openshift/deploy_che.sh
+++ b/deploy/openshift/deploy_che.sh
@@ -203,10 +203,10 @@ export KEYCLOAK_PASSWORD=${KEYCLOAK_PASSWORD:-${DEFAULT_KEYCLOAK_PASSWORD}}
 ###
 ### Plugin Registry settings
 ###
-DEFAULT_PLUGIN_REGISTRY_IMAGE_TAG="latest"
+DEFAULT_PLUGIN_REGISTRY_IMAGE_TAG="nightly"
 export PLUGIN_REGISTRY_IMAGE_TAG=${PLUGIN_REGISTRY_IMAGE_TAG:-${DEFAULT_PLUGIN_REGISTRY_IMAGE_TAG}}
 
-DEFAULT_PLUGIN_REGISTRY_IMAGE="quay.io/openshiftio/che-plugin-registry"
+DEFAULT_PLUGIN_REGISTRY_IMAGE="quay.io/eclipse/che-plugin-registry"
 export PLUGIN_REGISTRY_IMAGE=${PLUGIN_REGISTRY_IMAGE:-${DEFAULT_PLUGIN_REGISTRY_IMAGE}}
 
 DEFAULT_PLUGIN_REGISTRY_IMAGE_PULL_POLICY="Always"
@@ -218,10 +218,10 @@ export PLUGIN__REGISTRY__URL=${PLUGIN__REGISTRY__URL:-${DEFAULT_PLUGIN__REGISTRY
 ###
 ### Devfile Registry settings
 ###
-DEFAULT_DEVFILE_REGISTRY_IMAGE_TAG="latest"
+DEFAULT_DEVFILE_REGISTRY_IMAGE_TAG="nightly"
 export DEVFILE_REGISTRY_IMAGE_TAG=${DEVFILE_REGISTRY_IMAGE_TAG:-${DEFAULT_DEVFILE_REGISTRY_IMAGE_TAG}}
 
-DEFAULT_DEVFILE_REGISTRY_IMAGE="quay.io/openshiftio/che-devfile-registry"
+DEFAULT_DEVFILE_REGISTRY_IMAGE="quay.io/eclipse/che-devfile-registry"
 export DEVFILE_REGISTRY_IMAGE=${DEVFILE_REGISTRY_IMAGE:-${DEFAULT_DEVFILE_REGISTRY_IMAGE}}
 
 DEFAULT_DEVFILE_REGISTRY_IMAGE_PULL_POLICY="Always"