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 60cd85e29b7..740f7c1b792 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
@@ -666,10 +666,10 @@ che.wsagent.cors.enabled=true
 ## Factory defaults.
 # Editor and plugin which will be used for factories which are created from remote git repository
 # which doesn't contain any Che-specific workspace descriptors (like .devfile of .factory.json)
-che.factory.default_editor=eclipse/che-theia/next
+che.factory.default_editor=eclipse/che-theia/7.1.0
 # multiple plugins must be comma-separated, for example:
 # pluginFooPublisher/pluginFooName/pluginFooVersion,pluginBarPublisher/pluginBarName/pluginBarVersion
-che.factory.default_plugins=eclipse/che-machine-exec-plugin/next
+che.factory.default_plugins=eclipse/che-machine-exec-plugin/7.1.0
 
 ## Devfile settings
 
@@ -678,7 +678,7 @@ che.factory.default_plugins=eclipse/che-machine-exec-plugin/next
 # Default Editor that should be provisioned into Devfile if there is no specified Editor
 # Format is `editorPublisher/editorName/editorVersion` value.
 # `NULL` or absence of value means that default editor should not be provisioned.
-che.workspace.devfile.default_editor=eclipse/che-theia/next
+che.workspace.devfile.default_editor=eclipse/che-theia/7.1.0
 
 # Default Plugins which should be provisioned for Default Editor.
 # All the plugins from this list that are not explicitly mentioned in the user-defined devfile
@@ -686,4 +686,4 @@ che.workspace.devfile.default_editor=eclipse/che-theia/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/next
+che.workspace.devfile.default_editor.plugins=eclipse/che-machine-exec-plugin/7.1.0
diff --git a/deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/values.yaml b/deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/values.yaml
index 2de9080b0e0..72a386b70a9 100644
--- a/deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/values.yaml
+++ b/deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/values.yaml
@@ -8,7 +8,7 @@
 #
 
 cheDevfileRegistry:
-  image: quay.io/eclipse/che-devfile-registry:nightly
+  image: quay.io/eclipse/che-devfile-registry:7.1.0
   imagePullPolicy: Always
   memoryLimit: 256Mi
   memoryRequests: 16Mi
diff --git a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/values.yaml b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/values.yaml
index 33d5ef316e0..2f91ab4eeae 100644
--- a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/values.yaml
+++ b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/values.yaml
@@ -11,5 +11,5 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-image: eclipse/che-keycloak:nightly
+image: eclipse/che-keycloak:7.1.0
 requireAdminPasswordChange: true
diff --git a/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/values.yaml b/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/values.yaml
index 8c3b6acbdd8..989be4fd0bc 100644
--- a/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/values.yaml
+++ b/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/values.yaml
@@ -8,7 +8,7 @@
 #
 
 chePluginRegistry:
-  image: quay.io/eclipse/che-plugin-registry:nightly
+  image: quay.io/eclipse/che-plugin-registry:7.1.0
   imagePullPolicy: Always
   memoryLimit: 256Mi
   memoryRequests: 16Mi
diff --git a/deploy/kubernetes/helm/che/custom-charts/che-postgres/values.yaml b/deploy/kubernetes/helm/che/custom-charts/che-postgres/values.yaml
index 4a87ce862eb..f9f582bef67 100644
--- a/deploy/kubernetes/helm/che/custom-charts/che-postgres/values.yaml
+++ b/deploy/kubernetes/helm/che/custom-charts/che-postgres/values.yaml
@@ -10,4 +10,4 @@
 # Default values for postgres.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
-image: eclipse/che-postgres:nightly
+image: eclipse/che-postgres:7.1.0
diff --git a/deploy/kubernetes/helm/che/values.yaml b/deploy/kubernetes/helm/che/values.yaml
index 11ac588b6ea..8d9f926d1ec 100644
--- a/deploy/kubernetes/helm/che/values.yaml
+++ b/deploy/kubernetes/helm/che/values.yaml
@@ -16,7 +16,7 @@
 cheWorkspaceHttpProxy: ""
 cheWorkspaceHttpsProxy: ""
 cheWorkspaceNoProxy: ""
-cheImage: eclipse/che-server:nigthly
+cheImage: eclipse/che-server:7.1.0
 cheImagePullPolicy: Always
 cheKeycloakRealm: "che"
 cheKeycloakClientId: "che-public"
diff --git a/deploy/openshift/deploy_che.sh b/deploy/openshift/deploy_che.sh
index be4620d7247..41ce34603c1 100755
--- a/deploy/openshift/deploy_che.sh
+++ b/deploy/openshift/deploy_che.sh
@@ -203,7 +203,7 @@ export KEYCLOAK_PASSWORD=${KEYCLOAK_PASSWORD:-${DEFAULT_KEYCLOAK_PASSWORD}}
 ###
 ### Plugin Registry settings
 ###
-DEFAULT_PLUGIN_REGISTRY_IMAGE_TAG="nightly"
+DEFAULT_PLUGIN_REGISTRY_IMAGE_TAG="7.1.0"
 export PLUGIN_REGISTRY_IMAGE_TAG=${PLUGIN_REGISTRY_IMAGE_TAG:-${DEFAULT_PLUGIN_REGISTRY_IMAGE_TAG}}
 
 DEFAULT_PLUGIN_REGISTRY_IMAGE="quay.io/eclipse/che-plugin-registry"
@@ -218,7 +218,7 @@ export PLUGIN__REGISTRY__URL=${PLUGIN__REGISTRY__URL:-${DEFAULT_PLUGIN__REGISTRY
 ###
 ### Devfile Registry settings
 ###
-DEFAULT_DEVFILE_REGISTRY_IMAGE_TAG="nightly"
+DEFAULT_DEVFILE_REGISTRY_IMAGE_TAG="7.1.0"
 export DEVFILE_REGISTRY_IMAGE_TAG=${DEVFILE_REGISTRY_IMAGE_TAG:-${DEFAULT_DEVFILE_REGISTRY_IMAGE_TAG}}
 
 DEFAULT_DEVFILE_REGISTRY_IMAGE="quay.io/eclipse/che-devfile-registry"