diff --git a/api/v2/checluster_types.go b/api/v2/checluster_types.go
index 5e7d59b424..1e7aed5019 100644
--- a/api/v2/checluster_types.go
+++ b/api/v2/checluster_types.go
@@ -368,7 +368,7 @@ type PluginRegistry struct {
 // Configuration settings related to the devfile registry used by the Che installation.
 // +k8s:openapi-gen=true
 type DevfileRegistry struct {
-	// Deployment override options.
+	// Deprecated deployment override options.
 	// +optional
 	Deployment *Deployment `json:"deployment,omitempty"`
 	// Disables internal devfile registry.
@@ -857,7 +857,7 @@ type CheClusterStatus struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=status,displayName="ChePhase"
 	// +operator-sdk:csv:customresourcedefinitions:type=status,xDescriptors="urn:alm:descriptor:text"
 	ChePhase CheClusterPhase `json:"chePhase,omitempty"`
-	// The public URL of the internal devfile registry.
+	// Deprecated the public URL of the internal devfile registry.
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=status
 	// +operator-sdk:csv:customresourcedefinitions:type=status,displayName="Devfile registry URL"
@@ -893,7 +893,7 @@ type CheClusterStatus struct {
 
 // The `CheCluster` custom resource allows defining and managing Eclipse Che server installation.
 // Based on these settings, the  Operator automatically creates and maintains several ConfigMaps:
-// `che`, `plugin-registry`, `devfile-registry` that will contain the appropriate environment variables
+// `che`, `plugin-registry` that will contain the appropriate environment variables
 // of the various components of the installation. These generated ConfigMaps must NOT be updated manually.
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:object:root=true
diff --git a/build/scripts/dockerContainerExtract.sh b/build/scripts/dockerContainerExtract.sh
deleted file mode 100755
index 330c32d0af..0000000000
--- a/build/scripts/dockerContainerExtract.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2019-2023 Red Hat, Inc.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#   Red Hat, Inc. - initial API and implementation
-#
-
-set -e +x
-
-if [[ ! $1 ]]; then
-  echo "Usage: $0 CONTAINER [tar-extraction-flags]"
-  echo "Usage: $0 quay.io/devspaces/devspaces-operator-bundle:latest"
-  echo "Usage: $0 quay.io/devspaces/devfileregistry-rhel8:latest var/www/html/*/external_images.txt"
-  echo "Usage: $0 quay.io/devspaces/pluginregistry-rhel8:latest var/www/html/*/external_images.txt"
-  exit
-fi
-
-PODMAN=$(command -v podman)
-if [[ ! -x $PODMAN ]]; then
-  echo "[WARNING] podman is not installed."
-  PODMAN=$(command -v docker)
-  if [[ ! -x $PODMAN ]]; then
-    echo "[ERROR] docker is not installed. Aborting."; exit 1
-  fi
-fi
-
-container="$1"; shift 1
-tmpcontainer="$(echo $container | tr "/:" "--")-$(date +%s)"
-unpackdir="/tmp/${tmpcontainer}"
-
-# get remote image
-echo "[INFO] Pulling $container ..."
-${PODMAN} pull $container 2>&1
-
-# create local container
-${PODMAN} rm -f "${tmpcontainer}" 2>&1 >/dev/null || true
-# use sh for regular containers or ls for scratch containers
-${PODMAN} create --name="${tmpcontainer}" $container sh 2>&1 >/dev/null || ${PODMAN} create --name="${tmpcontainer}" $container ls 2>&1 >/dev/null 
-
-# export and unpack
-${PODMAN} export "${tmpcontainer}" > /tmp/${tmpcontainer}.tar
-rm -fr "$unpackdir"; mkdir -p "$unpackdir"
-echo "[INFO] Extract from container ..."
-tar xf /tmp/${tmpcontainer}.tar --wildcards -C "$unpackdir" $*
-
-# cleanup
-${PODMAN} rm -f "${tmpcontainer}" 2>&1 >/dev/null || true
-rm -fr  /tmp/${tmpcontainer}.tar
-
-echo "[INFO] Container $container unpacked to $unpackdir"
diff --git a/build/scripts/minikube-tests/minikube-checluster-patch.yaml b/build/scripts/minikube-tests/minikube-checluster-patch.yaml
index 258adc1872..59f94693fc 100644
--- a/build/scripts/minikube-tests/minikube-checluster-patch.yaml
+++ b/build/scripts/minikube-tests/minikube-checluster-patch.yaml
@@ -35,14 +35,6 @@ spec:
                 cpu: '20m'
               limits:
                 cpu: '20m'
-    devfileRegistry:
-      deployment:
-        containers:
-          - resources:
-              request:
-                cpu: '20m'
-              limits:
-                cpu: '20m'
     cheServer:
       deployment:
         containers:
diff --git a/build/scripts/minikube-tests/test-helm.sh b/build/scripts/minikube-tests/test-helm.sh
index cb14758b59..5129f2372b 100755
--- a/build/scripts/minikube-tests/test-helm.sh
+++ b/build/scripts/minikube-tests/test-helm.sh
@@ -57,9 +57,7 @@ runTest() {
 
   # Patch CheCluster CR to limit resources (see minikube-checluster-patch.yaml)
   CHECLUSTER_CR="${HELMCHART_DIR}"/templates/org_v2_checluster.yaml
-  yq -riY '.spec.components = null' ${CHECLUSTER_CR}
-  yq -riY '.spec.components.pluginRegistry.openVSXURL = "https://open-vsx.org"' ${CHECLUSTER_CR}
-  for component in pluginRegistry devfileRegistry dashboard; do
+  for component in dashboard; do
     yq -riY '.spec.components.'${component}'.deployment.containers[0].resources = {limits: {cpu: "50m"}, request: {cpu: "50m"}}' ${CHECLUSTER_CR}
   done
   yq -riY '.spec.components.cheServer.deployment.containers[0].resources.limits.cpu = "500m"' ${CHECLUSTER_CR}
diff --git a/build/scripts/oc-tests/oc-test-disconnected.sh b/build/scripts/oc-tests/oc-test-disconnected.sh
deleted file mode 100755
index 1bf4dc18ce..0000000000
--- a/build/scripts/oc-tests/oc-test-disconnected.sh
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2019-2023 Red Hat, Inc.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#   Red Hat, Inc. - initial API and implementation
-#
-
-set -ex
-
-export OPERATOR_REPO=$(dirname "$(dirname "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")")")
-
-# Define Disconnected tests environment
-export INTERNAL_REGISTRY_URL=${INTERNAL_REGISTRY_URL-"UNDEFINED"}
-export INTERNAL_REG_USERNAME=${INTERNAL_REG_USERNAME-"UNDEFINED"}
-export INTERNAL_REG_PASS="${INTERNAL_REG_PASS-"UNDEFINED"}"
-export SLACK_TOKEN="${SLACK_TOKEN-"UNDEFINED"}"
-export WORKSPACE="${WORKSPACE-"UNDEFINED"}"
-export REG_CREDS=${XDG_RUNTIME_DIR}/containers/auth.json
-export ORGANIZATION="eclipse"
-export TAG="next"
-
-# catch and stop execution on any error
-trap "catchDisconnectedJenkinsFinish" EXIT SIGINT
-
-# Catch an error after existing from jenkins Workspace
-function catchDisconnectedJenkinsFinish() {
-    EXIT_CODE=$?
-
-    if [ "$EXIT_CODE" != "0" ]; then
-      export JOB_RESULT=":alert-siren: Failed :alert-siren:"
-    else
-      export JOB_RESULT=":tada: Success :tada:"
-    fi
-
-    mkdir -p ${WORKSPACE}/artifacts
-    chectl server:logs --directory=${WORKSPACE}/artifacts
-
-    echo "[INFO] Please check Jenkins Artifacts-> ${BUILD_URL}"
-    /bin/bash "${OPERATOR_REPO}"/.github/bin/slack.sh
-
-    exit $EXIT_CODE
-}
-
-# Check if all necessary environment for disconnected test are defined
-if [[ "$WORKSPACE" == "UNDEFINED" ]]; then
-    echo "[ERROR] Jenkins Workspace env is not defined."
-    exit 1
-fi
-
-if [[ "$SLACK_TOKEN" == "UNDEFINED" ]]; then
-    echo "[ERROR] Internal registry credentials environment is not defined."
-    exit 1
-fi
-
-if [[ "$REG_CREDS" == "UNDEFINED" ]]; then
-    echo "[ERROR] Internal registry credentials environment is not defined."
-    exit 1
-fi
-
-if [[ "$INTERNAL_REGISTRY_URL" == "UNDEFINED" ]]; then
-    echo "[ERROR] Internal registry url environment is not defined."
-    exit 1
-fi
-
-if [[ "$INTERNAL_REG_USERNAME" == "UNDEFINED" ]]; then
-    echo "[ERROR] Internal registry username environment is not defined."
-    exit 1
-fi
-
-if [[ "$INTERNAL_REG_PASS" == "UNDEFINED" ]]; then
-    echo "[ERROR] Internal registry password environment is not defined."
-    exit 1
-fi
-
-# Login to internal registry using podman
-podman login -u "${INTERNAL_REG_USERNAME}" -p "${INTERNAL_REG_PASS}" --tls-verify=false ${INTERNAL_REGISTRY_URL} --authfile=${REG_CREDS}
-
-# Build che-plugin-registry and che-devfile-registry from Github Sources
-# Che-Devfile-Registry Build
-git clone git@github.com:eclipse/che-devfile-registry.git
-cd che-devfile-registry
-
-./build.sh --organization "${ORGANIZATION}" \
-           --registry "${INTERNAL_REGISTRY_URL}" \
-           --tag "${TAG}" \
-           --offline
-cd .. && rm -rf che-devfile-registry
-
-# Che-Plugin-Registry-Build
-git clone git@github.com:eclipse-che/che-plugin-registry.git
-cd che-plugin-registry
-
-export SKIP_TEST=true
-./build.sh --organization "${ORGANIZATION}" \
-           --registry "${INTERNAL_REGISTRY_URL}" \
-           --tag "${TAG}" \
-           --offline \
-           --skip-digest-generation
-
-cd .. && rm -rf che-plugin-registry
-
-# Push devfile and plugins image to private registry
-podman push --authfile="${REG_CREDS}" --tls-verify=false "${INTERNAL_REGISTRY_URL}"/"${ORGANIZATION}"/che-devfile-registry:"${TAG}"
-podman push --authfile="${REG_CREDS}" --tls-verify=false "${INTERNAL_REGISTRY_URL}"/"${ORGANIZATION}"/che-plugin-registry:"${TAG}"
-
-# Get all containers images used in eclipse-che deployment(postgresql, che-server, che-dashboard...)
-curl -sSLo- https://raw.githubusercontent.com/eclipse-che/che-operator/main/config/manager/manager.yaml > /tmp/yam.yaml
-export ARRAY_OF_IMAGES=$(cat /tmp/yam.yaml | yq '.spec.template.spec.containers[0].env[] | select(.name|test("RELATED_")) | .value' -r)
-
-# Remove from Array of images devfile and plugins because will be builded using build.sh in offline mode.
-for delete in 'quay.io/eclipse/che-plugin-registry:next' 'quay.io/eclipse/che-devfile-registry:next'
-do
-    #Quotes when working with strings
-    ARRAY_OF_IMAGES=("${ARRAY_OF_IMAGES[@]/$delete}")
-done
-
-# Copy all che components to internal registry
-for IMAGE in ${ARRAY_OF_IMAGES[@]};
-do
-    echo -e "[INFO] Copying image ${IMAGE} to internal registry..."
-    if [[ "$IMAGE" =~ ^registry.access.redhat.com* ]]; then
-        IMG_VALUE=$(echo $IMAGE | sed -e "s/registry.access.redhat.com/""/g")
-        sudo skopeo copy --authfile=${REG_CREDS} --dest-tls-verify=false docker://"${IMAGE}" docker://"${INTERNAL_REGISTRY_URL}/eclipse${IMG_VALUE}"
-    fi
-
-    if [[ "$IMAGE" =~ ^quay.io* ]]; then
-        IMG_VALUE=$(echo $IMAGE | sed -e "s/quay.io/"${INTERNAL_REGISTRY_URL}"/g")
-        sudo skopeo copy --authfile=${REG_CREDS} --dest-tls-verify=false docker://"${IMAGE}" docker://"${IMG_VALUE}"
-    fi
-done
-
-# Copy Che Operator into private registry
-sudo skopeo copy --authfile=${REG_CREDS} --dest-tls-verify=false docker://quay.io/eclipse/che-operator:next docker://${INTERNAL_REGISTRY_URL}/eclipse/che-operator:next
-
-# Define the CR patch specifying the airgap registry and nonProxy-hosts
-cat >/tmp/che-cr-patch.yaml <<EOL
-spec:
-  server:
-    airGapContainerRegistryHostname: $INTERNAL_REGISTRY_URL
-    airGapContainerRegistryOrganization: 'eclipse'
-EOL
-
-# Deploy Eclipse Che and retrieve golang devfile from devfile-registry
-chectl server:deploy \
-    --batch \
-    --telemetry=off \
-    --k8spodwaittimeout=1800000  \
-    --che-operator-cr-patch-yaml=/tmp/che-cr-patch.yaml \
-    --che-operator-image=${INTERNAL_REGISTRY_URL}/eclipse/che-operator:next \
-    --platform=openshift \
-    --installer=operator
-
-# Add a sleep of 2 hours to do some manual tests in the cluster if need it.
-sleep 2h
diff --git a/build/scripts/release/addDigests.sh b/build/scripts/release/addDigests.sh
index 763637be51..240710d585 100755
--- a/build/scripts/release/addDigests.sh
+++ b/build/scripts/release/addDigests.sh
@@ -84,8 +84,6 @@ do
   source=$(echo "${mapping}" | sed -e 's;\(.*\)=.*=.*;\1;')
   # Image with digest.
   dest=$(echo "${mapping}" | sed -e 's;.*=.*=\(.*\);\1;')
-  # Image label to set image target. For example: 'devfile-registry-image'
-  imageLabel=$(echo "${mapping}" | sed -e 's;.*=\(.*\)=.*;\1;')
   name=$(echo "${dest}" | sed -e 's;.*/\([^\/][^\/]*\)@.*;\1;')
   tagOrDigest=""
   if [[ ${source} == *"@"* ]]; then
@@ -94,20 +92,6 @@ do
     tagOrDigest="${source#*:}"
   fi
 
-  if [[ ${imageLabel} == "devfile-registry-image" ]]; then
-    # Image tag could contains invalid for Env variable name characters, so let's encode it using base32.
-    # But alphabet of base32 uses one invalid for env variable name character '=' at the end of the line, so let's replace it by '_'.
-    # To recovery original tag should be done opposite actions: replace '_' to '=', and decode string using 'base32 -d'.
-    encodedTag=$(echo "${tagOrDigest}" | base32 -w 0 | tr "=" "_")
-    relatedImageEnvName=$(echo "${RELATED_IMAGE_PREFIX}${name}_${imageLabel}_${encodedTag}" | sed -r 's/[-.]/_/g')
-    ENV="{ name: \"${relatedImageEnvName}\", value: \"${dest}\"}"
-    if [[ -z ${RELATED_IMAGES_ENV} ]]; then
-      RELATED_IMAGES_ENV="${ENV}"
-    elif [[ ! ${RELATED_IMAGES_ENV} =~ ${relatedImageEnvName} ]]; then
-      RELATED_IMAGES_ENV="${RELATED_IMAGES_ENV}, ${ENV}"
-    fi
-  fi
-
   relatedImageName=${name}-${tagOrDigest}
   RELATED_IMAGE="{ name: \"${relatedImageName}\", image: \"${dest}\", tag: \"${source}\"}"
   if [[ -z ${RELATED_IMAGES} ]]; then
@@ -131,7 +115,7 @@ if [[ ${OPERATOR_FILE} ]]; then
   i=0
   while [ "${i}" -lt "${envVarLength}" ]; do
     envVarName=$(cat "${OPERATOR_FILE}" | yq -r '.spec.template.spec.containers[0].env['${i}'].name')
-    if [[ ${envVarName} =~ plugin_registry_image ]] || [[ ${envVarName} =~ devfile_registry_image ]]; then
+    if [[ ${envVarName} =~ editor_definition ]]; then
       yq -riY 'del(.spec.template.spec.containers[0].env['${i}'])' ${OPERATOR_FILE}
       i=$((i-1))
     fi
diff --git a/build/scripts/release/buildDigestMap.sh b/build/scripts/release/buildDigestMap.sh
index 0bccf8b7e8..022f8f73fc 100755
--- a/build/scripts/release/buildDigestMap.sh
+++ b/build/scripts/release/buildDigestMap.sh
@@ -46,13 +46,6 @@ setOperatorImage() {
     OPERATOR_IMAGE=$(yq -r '.spec.install.spec.deployments[].spec.template.spec.containers[0].image' "${CSV}")
 }
 
-setDevfileRegistryList() {
-    registry=$(yq -r '.spec.install.spec.deployments[].spec.template.spec.containers[].env[] | select(.name | test("RELATED_IMAGE_.*devfile_registry"; "g")) | .value' "${CSV}")
-
-    setRegistryImages "${registry}"
-    DEVFILE_REGISTRY_LIST=${registryImages}
-}
-
 setRegistryImages() {
     registry="${1}"
     registry="${registry/\@sha256:*/:${IMAGE_TAG}}" # remove possible existing @sha256:... and use current tag instead
@@ -139,9 +132,6 @@ setImagesFromDeploymentEnv
 setOperatorImage
 echo "${OPERATOR_IMAGE}"
 
-setDevfileRegistryList
-echo "${DEVFILE_REGISTRY_LIST}"
-
 DIGEST_FILE=${SCRIPTS_DIR}/generated/digests-mapping.txt
 rm -Rf "${DIGEST_FILE}"
 touch "${DIGEST_FILE}"
@@ -151,7 +141,3 @@ writeDigest "${OPERATOR_IMAGE}" "operator-image"
 for image in ${REQUIRED_IMAGES}; do
   writeDigest "${image}" "required-image"
 done
-
-for image in ${DEVFILE_REGISTRY_LIST}; do
-  writeDigest "${image}" "devfile-registry-image"
-done
diff --git a/build/scripts/release/make-release.sh b/build/scripts/release/make-release.sh
index e6ba92a00a..9dc6230088 100755
--- a/build/scripts/release/make-release.sh
+++ b/build/scripts/release/make-release.sh
@@ -35,7 +35,6 @@ init() {
   CHE_SERVER_IMAGE=$(yq -r '.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_che_server") | .value' "${MANAGER_YAML}" | sed -e "s/\(.*:\).*/\1${RELEASE}/")
   CHE_DASHBOARD_IMAGE=$(yq -r '.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_dashboard") | .value' "${MANAGER_YAML}" | sed -e "s/\(.*:\).*/\1${RELEASE}/")
   CHE_PLUGIN_REGISTRY_IMAGE=$(yq -r '.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_plugin_registry") | .value' "${MANAGER_YAML}" | sed -e "s/\(.*:\).*/\1${RELEASE}/")
-  CHE_DEVFILE_REGISTRY_IMAGE=$(yq -r '.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_devfile_registry") | .value' "${MANAGER_YAML}" | sed -e "s/\(.*:\).*/\1${RELEASE}/")
   CHE_GATEWAY_IMAGE=$(yq -r '.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_single_host_gateway_config_sidecar") | .value' "${MANAGER_YAML}" | sed -e "s/\(.*:\).*/\1${RELEASE}/")
 
   if [[ $# -lt 1 ]]; then usage; exit; fi
@@ -102,7 +101,6 @@ releaseManagerYaml() {
   yq -riY '(.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_che_server") | .value) = "'${CHE_SERVER_IMAGE}'"' "${MANAGER_YAML}"
   yq -riY '(.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_dashboard") | .value) = "'${CHE_DASHBOARD_IMAGE}'"' "${MANAGER_YAML}"
   yq -riY '(.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_plugin_registry") | .value) = "'${CHE_PLUGIN_REGISTRY_IMAGE}'"' "${MANAGER_YAML}"
-  yq -riY '(.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_devfile_registry") | .value) = "'${CHE_DEVFILE_REGISTRY_IMAGE}'"' "${MANAGER_YAML}"
   yq -riY '(.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_single_host_gateway_config_sidecar") | .value) = "'${CHE_GATEWAY_IMAGE}'"' "${MANAGER_YAML}"
 
   echo "[INFO] releaseManagerYaml :: Update editors definitions images"
diff --git a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml
index d7edabac5d..51daf6d72a 100644
--- a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml
+++ b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml
@@ -104,7 +104,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/eclipse-che/che-operator
     support: Eclipse Foundation
-  name: eclipse-che.v7.89.0-876.next
+  name: eclipse-che.v7.90.0-878.next
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -112,10 +112,9 @@ spec:
     owned:
       - description: 'The `CheCluster` custom resource allows defining and managing
           Eclipse Che server installation. Based on these settings, the  Operator
-          automatically creates and maintains several ConfigMaps: `che`, `plugin-registry`,
-          `devfile-registry` that will contain the appropriate environment variables
-          of the various components of the installation. These generated ConfigMaps
-          must NOT be updated manually.'
+          automatically creates and maintains several ConfigMaps: `che`, `plugin-registry`
+          that will contain the appropriate environment variables of the various components
+          of the installation. These generated ConfigMaps must NOT be updated manually.'
         displayName: Eclipse Che instance Specification
         kind: CheCluster
         name: checlusters.org.eclipse.che
@@ -226,7 +225,7 @@ spec:
             path: cheVersion
             x-descriptors:
               - urn:alm:descriptor:text
-          - description: The public URL of the internal devfile registry.
+          - description: Deprecated the public URL of the internal devfile registry.
             displayName: Devfile registry URL
             path: devfileRegistryURL
             x-descriptors:
@@ -881,8 +880,6 @@ spec:
                         value: quay.io/eclipse/che-dashboard:next
                       - name: RELATED_IMAGE_plugin_registry
                         value: quay.io/eclipse/che-plugin-registry:next
-                      - name: RELATED_IMAGE_devfile_registry
-                        value: quay.io/eclipse/che-devfile-registry:next
                       - name: RELATED_IMAGE_che_tls_secrets_creation_job
                         value: quay.io/eclipse/che-tls-secret-creator:alpine-01a4c34
                       - name: RELATED_IMAGE_single_host_gateway
@@ -919,6 +916,8 @@ spec:
                           {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
                       - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
                         value: https://open-vsx.org
+                      - name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES
+                        value: '[{"url": "https://registry.devfile.io"}]'
                       - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES
                         value: "false"
                       - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_CONTAINERSECURITYCONTEXT
@@ -1036,7 +1035,7 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: Eclipse Foundation
-  version: 7.89.0-876.next
+  version: 7.90.0-878.next
   webhookdefinitions:
     - admissionReviewVersions:
         - v1
diff --git a/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml b/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml
index 25ba7550fe..bc2fe8dcea 100644
--- a/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml
+++ b/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml
@@ -4029,7 +4029,7 @@ spec:
           description: |-
             The `CheCluster` custom resource allows defining and managing Eclipse Che server installation.
             Based on these settings, the  Operator automatically creates and maintains several ConfigMaps:
-            `che`, `plugin-registry`, `devfile-registry` that will contain the appropriate environment variables
+            `che`, `plugin-registry` that will contain the appropriate environment variables
             of the various components of the installation. These generated ConfigMaps must NOT be updated manually.
           properties:
             apiVersion:
@@ -4628,7 +4628,7 @@ spec:
                         used by the Che installation.
                       properties:
                         deployment:
-                          description: Deployment override options.
+                          description: Deprecated deployment override options.
                           properties:
                             containers:
                               description: List of containers belonging to the pod.
@@ -8338,7 +8338,7 @@ spec:
                   description: Currently installed Che version.
                   type: string
                 devfileRegistryURL:
-                  description: The public URL of the internal devfile registry.
+                  description: Deprecated the public URL of the internal devfile registry.
                   type: string
                 gatewayPhase:
                   description: Specifies the current phase of the gateway deployment.
diff --git a/config/crd/bases/org.eclipse.che_checlusters.yaml b/config/crd/bases/org.eclipse.che_checlusters.yaml
index b3742bbf0c..e9583ee45b 100644
--- a/config/crd/bases/org.eclipse.che_checlusters.yaml
+++ b/config/crd/bases/org.eclipse.che_checlusters.yaml
@@ -3995,7 +3995,7 @@ spec:
         description: |-
           The `CheCluster` custom resource allows defining and managing Eclipse Che server installation.
           Based on these settings, the  Operator automatically creates and maintains several ConfigMaps:
-          `che`, `plugin-registry`, `devfile-registry` that will contain the appropriate environment variables
+          `che`, `plugin-registry` that will contain the appropriate environment variables
           of the various components of the installation. These generated ConfigMaps must NOT be updated manually.
         properties:
           apiVersion:
@@ -4590,7 +4590,7 @@ spec:
                       used by the Che installation.
                     properties:
                       deployment:
-                        description: Deployment override options.
+                        description: Deprecated deployment override options.
                         properties:
                           containers:
                             description: List of containers belonging to the pod.
@@ -8285,7 +8285,7 @@ spec:
                 description: Currently installed Che version.
                 type: string
               devfileRegistryURL:
-                description: The public URL of the internal devfile registry.
+                description: Deprecated the public URL of the internal devfile registry.
                 type: string
               gatewayPhase:
                 description: Specifies the current phase of the gateway deployment.
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 81b6ab6d38..2dff0b24eb 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -67,8 +67,6 @@ spec:
               value: quay.io/eclipse/che-dashboard:next
             - name: RELATED_IMAGE_plugin_registry
               value: quay.io/eclipse/che-plugin-registry:next
-            - name: RELATED_IMAGE_devfile_registry
-              value: quay.io/eclipse/che-devfile-registry:next
             - name: RELATED_IMAGE_che_tls_secrets_creation_job
               value: quay.io/eclipse/che-tls-secret-creator:alpine-01a4c34
             - name: RELATED_IMAGE_single_host_gateway
@@ -105,6 +103,8 @@ spec:
               value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
             - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
               value: https://open-vsx.org
+            - name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES
+              value: '[{"url": "https://registry.devfile.io"}]'
             - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES
               value: 'false'
             - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_CONTAINERSECURITYCONTEXT
diff --git a/config/manifests/bases/che-operator.clusterserviceversion.yaml b/config/manifests/bases/che-operator.clusterserviceversion.yaml
index f8a4715f3a..91253b498c 100644
--- a/config/manifests/bases/che-operator.clusterserviceversion.yaml
+++ b/config/manifests/bases/che-operator.clusterserviceversion.yaml
@@ -43,9 +43,9 @@ spec:
     owned:
     - description: 'The `CheCluster` custom resource allows defining and managing
         Eclipse Che server installation. Based on these settings, the  Operator automatically
-        creates and maintains several ConfigMaps: `che`, `plugin-registry`, `devfile-registry`
-        that will contain the appropriate environment variables of the various components
-        of the installation. These generated ConfigMaps must NOT be updated manually.'
+        creates and maintains several ConfigMaps: `che`, `plugin-registry` that will
+        contain the appropriate environment variables of the various components of
+        the installation. These generated ConfigMaps must NOT be updated manually.'
       displayName: Eclipse Che instance Specification
       kind: CheCluster
       name: checlusters.org.eclipse.che
@@ -154,7 +154,7 @@ spec:
         path: cheVersion
         x-descriptors:
         - urn:alm:descriptor:text
-      - description: The public URL of the internal devfile registry.
+      - description: Deprecated the public URL of the internal devfile registry.
         displayName: Devfile registry URL
         path: devfileRegistryURL
         x-descriptors:
diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml
index 22526d7c58..bb7391f513 100644
--- a/deploy/deployment/kubernetes/combined.yaml
+++ b/deploy/deployment/kubernetes/combined.yaml
@@ -4016,7 +4016,7 @@ spec:
         description: |-
           The `CheCluster` custom resource allows defining and managing Eclipse Che server installation.
           Based on these settings, the  Operator automatically creates and maintains several ConfigMaps:
-          `che`, `plugin-registry`, `devfile-registry` that will contain the appropriate environment variables
+          `che`, `plugin-registry` that will contain the appropriate environment variables
           of the various components of the installation. These generated ConfigMaps must NOT be updated manually.
         properties:
           apiVersion:
@@ -4611,7 +4611,7 @@ spec:
                       used by the Che installation.
                     properties:
                       deployment:
-                        description: Deployment override options.
+                        description: Deprecated deployment override options.
                         properties:
                           containers:
                             description: List of containers belonging to the pod.
@@ -8306,7 +8306,7 @@ spec:
                 description: Currently installed Che version.
                 type: string
               devfileRegistryURL:
-                description: The public URL of the internal devfile registry.
+                description: Deprecated the public URL of the internal devfile registry.
                 type: string
               gatewayPhase:
                 description: Specifies the current phase of the gateway deployment.
@@ -8831,8 +8831,6 @@ spec:
           value: quay.io/eclipse/che-dashboard:next
         - name: RELATED_IMAGE_plugin_registry
           value: quay.io/eclipse/che-plugin-registry:next
-        - name: RELATED_IMAGE_devfile_registry
-          value: quay.io/eclipse/che-devfile-registry:next
         - name: RELATED_IMAGE_che_tls_secrets_creation_job
           value: quay.io/eclipse/che-tls-secret-creator:alpine-01a4c34
         - name: RELATED_IMAGE_single_host_gateway
@@ -8869,6 +8867,8 @@ spec:
           value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
         - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
           value: https://open-vsx.org
+        - name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES
+          value: '[{"url": "https://registry.devfile.io"}]'
         - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES
           value: "false"
         - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_CONTAINERSECURITYCONTEXT
diff --git a/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml b/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml
index cfd19830f5..679ae746c5 100644
--- a/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml
+++ b/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml
@@ -61,8 +61,6 @@ spec:
           value: quay.io/eclipse/che-dashboard:next
         - name: RELATED_IMAGE_plugin_registry
           value: quay.io/eclipse/che-plugin-registry:next
-        - name: RELATED_IMAGE_devfile_registry
-          value: quay.io/eclipse/che-devfile-registry:next
         - name: RELATED_IMAGE_che_tls_secrets_creation_job
           value: quay.io/eclipse/che-tls-secret-creator:alpine-01a4c34
         - name: RELATED_IMAGE_single_host_gateway
@@ -99,6 +97,8 @@ spec:
           value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
         - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
           value: https://open-vsx.org
+        - name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES
+          value: '[{"url": "https://registry.devfile.io"}]'
         - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES
           value: "false"
         - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_CONTAINERSECURITYCONTEXT
diff --git a/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
index 1215ada3fd..1869f7d78b 100644
--- a/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
+++ b/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
@@ -4011,7 +4011,7 @@ spec:
         description: |-
           The `CheCluster` custom resource allows defining and managing Eclipse Che server installation.
           Based on these settings, the  Operator automatically creates and maintains several ConfigMaps:
-          `che`, `plugin-registry`, `devfile-registry` that will contain the appropriate environment variables
+          `che`, `plugin-registry` that will contain the appropriate environment variables
           of the various components of the installation. These generated ConfigMaps must NOT be updated manually.
         properties:
           apiVersion:
@@ -4606,7 +4606,7 @@ spec:
                       used by the Che installation.
                     properties:
                       deployment:
-                        description: Deployment override options.
+                        description: Deprecated deployment override options.
                         properties:
                           containers:
                             description: List of containers belonging to the pod.
@@ -8301,7 +8301,7 @@ spec:
                 description: Currently installed Che version.
                 type: string
               devfileRegistryURL:
-                description: The public URL of the internal devfile registry.
+                description: Deprecated the public URL of the internal devfile registry.
                 type: string
               gatewayPhase:
                 description: Specifies the current phase of the gateway deployment.
diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml
index be767243d4..38133fb1b3 100644
--- a/deploy/deployment/openshift/combined.yaml
+++ b/deploy/deployment/openshift/combined.yaml
@@ -4016,7 +4016,7 @@ spec:
         description: |-
           The `CheCluster` custom resource allows defining and managing Eclipse Che server installation.
           Based on these settings, the  Operator automatically creates and maintains several ConfigMaps:
-          `che`, `plugin-registry`, `devfile-registry` that will contain the appropriate environment variables
+          `che`, `plugin-registry` that will contain the appropriate environment variables
           of the various components of the installation. These generated ConfigMaps must NOT be updated manually.
         properties:
           apiVersion:
@@ -4611,7 +4611,7 @@ spec:
                       used by the Che installation.
                     properties:
                       deployment:
-                        description: Deployment override options.
+                        description: Deprecated deployment override options.
                         properties:
                           containers:
                             description: List of containers belonging to the pod.
@@ -8306,7 +8306,7 @@ spec:
                 description: Currently installed Che version.
                 type: string
               devfileRegistryURL:
-                description: The public URL of the internal devfile registry.
+                description: Deprecated the public URL of the internal devfile registry.
                 type: string
               gatewayPhase:
                 description: Specifies the current phase of the gateway deployment.
@@ -8833,8 +8833,6 @@ spec:
           value: quay.io/eclipse/che-dashboard:next
         - name: RELATED_IMAGE_plugin_registry
           value: quay.io/eclipse/che-plugin-registry:next
-        - name: RELATED_IMAGE_devfile_registry
-          value: quay.io/eclipse/che-devfile-registry:next
         - name: RELATED_IMAGE_che_tls_secrets_creation_job
           value: quay.io/eclipse/che-tls-secret-creator:alpine-01a4c34
         - name: RELATED_IMAGE_single_host_gateway
@@ -8871,6 +8869,8 @@ spec:
           value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
         - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
           value: https://open-vsx.org
+        - name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES
+          value: '[{"url": "https://registry.devfile.io"}]'
         - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES
           value: "false"
         - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_CONTAINERSECURITYCONTEXT
diff --git a/deploy/deployment/openshift/objects/che-operator.Deployment.yaml b/deploy/deployment/openshift/objects/che-operator.Deployment.yaml
index 4175728584..58ded21bd4 100644
--- a/deploy/deployment/openshift/objects/che-operator.Deployment.yaml
+++ b/deploy/deployment/openshift/objects/che-operator.Deployment.yaml
@@ -61,8 +61,6 @@ spec:
           value: quay.io/eclipse/che-dashboard:next
         - name: RELATED_IMAGE_plugin_registry
           value: quay.io/eclipse/che-plugin-registry:next
-        - name: RELATED_IMAGE_devfile_registry
-          value: quay.io/eclipse/che-devfile-registry:next
         - name: RELATED_IMAGE_che_tls_secrets_creation_job
           value: quay.io/eclipse/che-tls-secret-creator:alpine-01a4c34
         - name: RELATED_IMAGE_single_host_gateway
@@ -99,6 +97,8 @@ spec:
           value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
         - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
           value: https://open-vsx.org
+        - name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES
+          value: '[{"url": "https://registry.devfile.io"}]'
         - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES
           value: "false"
         - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_CONTAINERSECURITYCONTEXT
diff --git a/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
index 3cf81b7d12..ddbdd292c5 100644
--- a/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
+++ b/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
@@ -4011,7 +4011,7 @@ spec:
         description: |-
           The `CheCluster` custom resource allows defining and managing Eclipse Che server installation.
           Based on these settings, the  Operator automatically creates and maintains several ConfigMaps:
-          `che`, `plugin-registry`, `devfile-registry` that will contain the appropriate environment variables
+          `che`, `plugin-registry` that will contain the appropriate environment variables
           of the various components of the installation. These generated ConfigMaps must NOT be updated manually.
         properties:
           apiVersion:
@@ -4606,7 +4606,7 @@ spec:
                       used by the Che installation.
                     properties:
                       deployment:
-                        description: Deployment override options.
+                        description: Deprecated deployment override options.
                         properties:
                           containers:
                             description: List of containers belonging to the pod.
@@ -8301,7 +8301,7 @@ spec:
                 description: Currently installed Che version.
                 type: string
               devfileRegistryURL:
-                description: The public URL of the internal devfile registry.
+                description: Deprecated the public URL of the internal devfile registry.
                 type: string
               gatewayPhase:
                 description: Specifies the current phase of the gateway deployment.
diff --git a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
index 1215ada3fd..1869f7d78b 100644
--- a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
+++ b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
@@ -4011,7 +4011,7 @@ spec:
         description: |-
           The `CheCluster` custom resource allows defining and managing Eclipse Che server installation.
           Based on these settings, the  Operator automatically creates and maintains several ConfigMaps:
-          `che`, `plugin-registry`, `devfile-registry` that will contain the appropriate environment variables
+          `che`, `plugin-registry` that will contain the appropriate environment variables
           of the various components of the installation. These generated ConfigMaps must NOT be updated manually.
         properties:
           apiVersion:
@@ -4606,7 +4606,7 @@ spec:
                       used by the Che installation.
                     properties:
                       deployment:
-                        description: Deployment override options.
+                        description: Deprecated deployment override options.
                         properties:
                           containers:
                             description: List of containers belonging to the pod.
@@ -8301,7 +8301,7 @@ spec:
                 description: Currently installed Che version.
                 type: string
               devfileRegistryURL:
-                description: The public URL of the internal devfile registry.
+                description: Deprecated the public URL of the internal devfile registry.
                 type: string
               gatewayPhase:
                 description: Specifies the current phase of the gateway deployment.
diff --git a/helmcharts/next/templates/che-operator.Deployment.yaml b/helmcharts/next/templates/che-operator.Deployment.yaml
index cfd19830f5..679ae746c5 100644
--- a/helmcharts/next/templates/che-operator.Deployment.yaml
+++ b/helmcharts/next/templates/che-operator.Deployment.yaml
@@ -61,8 +61,6 @@ spec:
           value: quay.io/eclipse/che-dashboard:next
         - name: RELATED_IMAGE_plugin_registry
           value: quay.io/eclipse/che-plugin-registry:next
-        - name: RELATED_IMAGE_devfile_registry
-          value: quay.io/eclipse/che-devfile-registry:next
         - name: RELATED_IMAGE_che_tls_secrets_creation_job
           value: quay.io/eclipse/che-tls-secret-creator:alpine-01a4c34
         - name: RELATED_IMAGE_single_host_gateway
@@ -99,6 +97,8 @@ spec:
           value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
         - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
           value: https://open-vsx.org
+        - name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES
+          value: '[{"url": "https://registry.devfile.io"}]'
         - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES
           value: "false"
         - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_CONTAINERSECURITYCONTEXT
diff --git a/pkg/common/constants/constants.go b/pkg/common/constants/constants.go
index c74afa7ecd..c009c72aad 100644
--- a/pkg/common/constants/constants.go
+++ b/pkg/common/constants/constants.go
@@ -36,12 +36,6 @@ const (
 	DefaultPluginRegistryCpuLimit                             = "500m"
 	DefaultPluginRegistryCpuRequest                           = "100m"
 
-	// DevfileRegistry
-	DefaultDevfileRegistryMemoryLimit   = "256Mi"
-	DefaultDevfileRegistryMemoryRequest = "32Mi"
-	DefaultDevfileRegistryCpuLimit      = "500m"
-	DefaultDevfileRegistryCpuRequest    = "100m"
-
 	// Server
 	DefaultServerMemoryLimit               = "1024Mi"
 	DefaultServerMemoryRequest             = "512Mi"
diff --git a/pkg/common/operator-defaults/defaults.go b/pkg/common/operator-defaults/defaults.go
index 3bbdc2c403..b5726b6494 100644
--- a/pkg/common/operator-defaults/defaults.go
+++ b/pkg/common/operator-defaults/defaults.go
@@ -32,7 +32,6 @@ var (
 	defaultCheServerImage                                   string
 	defaultDashboardImage                                   string
 	defaultPluginRegistryImage                              string
-	defaultDevfileRegistryImage                             string
 	defaultCheTLSSecretsCreationJobImage                    string
 	defaultSingleHostGatewayImage                           string
 	defaultSingleHostGatewayConfigSidecarImage              string
@@ -48,6 +47,7 @@ var (
 	defaultDevEnvironmentsContainerSecurityContext          string
 	defaultPluginRegistryOpenVSXURL                         string
 	defaultDashboardHeaderMessageText                       string
+	defaultDevfileRegistryExternalDevfileRegistries         string
 
 	initialized = false
 )
@@ -83,11 +83,11 @@ func Initialize() {
 	defaultDevEnvironmentsDefaultEditor = os.Getenv("CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR")
 	defaultPluginRegistryOpenVSXURL = os.Getenv("CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL")
 	defaultDashboardHeaderMessageText = os.Getenv("CHE_DEFAULT_SPEC_COMPONENTS_DASHBOARD_HEADERMESSAGE_TEXT")
+	defaultDevfileRegistryExternalDevfileRegistries = os.Getenv("CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES")
 
 	defaultCheServerImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_che_server"))
 	defaultDashboardImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_dashboard"))
 	defaultPluginRegistryImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_plugin_registry"))
-	defaultDevfileRegistryImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_devfile_registry"))
 	defaultSingleHostGatewayImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_single_host_gateway"))
 	defaultSingleHostGatewayConfigSidecarImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_single_host_gateway_config_sidecar"))
 	defaultGatewayAuthenticationSidecarImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_gateway_authentication_sidecar"))
@@ -152,14 +152,6 @@ func GetPluginRegistryImage(checluster interface{}) string {
 	return PatchDefaultImageName(checluster, defaultPluginRegistryImage)
 }
 
-func GetDevfileRegistryImage(checluster interface{}) string {
-	if !initialized {
-		logrus.Fatalf("Operator defaults are not initialized.")
-	}
-
-	return PatchDefaultImageName(checluster, defaultDevfileRegistryImage)
-}
-
 func GetGatewayImage(checluster interface{}) string {
 	if !initialized {
 		logrus.Fatalf("Operator defaults are not initialized.")
@@ -232,6 +224,14 @@ func GetConsoleLinkImage() string {
 	return defaultsConsoleLinkImage
 }
 
+func GetDevfileRegistryExternalDevfileRegistries() string {
+	if !initialized {
+		logrus.Fatalf("Operator defaults are not initialized.")
+	}
+
+	return defaultDevfileRegistryExternalDevfileRegistries
+}
+
 func GetPluginRegistryOpenVSXURL() string {
 	if !initialized {
 		logrus.Fatalf("Operator defaults are not initialized.")
diff --git a/pkg/deploy/dashboard/dashboard_deployment_test.go b/pkg/deploy/dashboard/dashboard_deployment_test.go
index c31c316f84..27b32ff67a 100644
--- a/pkg/deploy/dashboard/dashboard_deployment_test.go
+++ b/pkg/deploy/dashboard/dashboard_deployment_test.go
@@ -178,10 +178,6 @@ func TestDashboardDeploymentEnvVars(t *testing.T) {
 					Name:  "CHE_INTERNAL_URL",
 					Value: "http://che-host.eclipse-che.svc:8080/api",
 				},
-				{
-					Name:  "CHE_WORKSPACE_DEVFILE__REGISTRY__INTERNAL__URL",
-					Value: "http://devfile-registry.eclipse-che.svc:8080",
-				},
 				{
 					Name:  "CHE_WORKSPACE_PLUGIN__REGISTRY__INTERNAL__URL",
 					Value: "http://plugin-registry.eclipse-che.svc:8080/v3",
@@ -201,6 +197,10 @@ func TestDashboardDeploymentEnvVars(t *testing.T) {
 					Name:  "CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS",
 					Value: defaults.GetDevEnvironmentsDefaultComponents(),
 				},
+				{
+					Name:  "CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES",
+					Value: defaults.GetDevfileRegistryExternalDevfileRegistries(),
+				},
 				{
 					Name:  "CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL",
 					Value: defaults.GetPluginRegistryOpenVSXURL(),
@@ -262,14 +262,14 @@ func TestDashboardDeploymentEnvVars(t *testing.T) {
 					Name:  "CHE_INTERNAL_URL",
 					Value: "http://che-host.eclipse-che.svc:8080/api",
 				},
-				{
-					Name:  "CHE_WORKSPACE_DEVFILE__REGISTRY__INTERNAL__URL",
-					Value: "http://devfile-registry.eclipse-che.svc:8080",
-				},
 				{
 					Name:  "CHE_WORKSPACE_PLUGIN__REGISTRY__INTERNAL__URL",
 					Value: "http://plugin-registry.eclipse-che.svc:8080/v3",
 				},
+				{
+					Name:  "CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES",
+					Value: defaults.GetDevfileRegistryExternalDevfileRegistries(),
+				},
 				{
 					Name:  "OPENSHIFT_CONSOLE_URL",
 					Value: "https://console-openshift-console.apps.my-host/",
diff --git a/pkg/deploy/dashboard/deployment_dashboard.go b/pkg/deploy/dashboard/deployment_dashboard.go
index fcf24a5c2b..956f344cd5 100644
--- a/pkg/deploy/dashboard/deployment_dashboard.go
+++ b/pkg/deploy/dashboard/deployment_dashboard.go
@@ -81,14 +81,6 @@ func (d *DashboardReconciler) getDashboardDeploymentSpec(ctx *chetypes.DeployCon
 			Value: fmt.Sprintf("http://%s.%s.svc:8080/api", deploy.CheServiceName, ctx.CheCluster.Namespace)},
 	)
 
-	if !ctx.CheCluster.Spec.Components.DevfileRegistry.DisableInternalRegistry {
-		envVars = append(envVars,
-			corev1.EnvVar{
-				Name:  "CHE_WORKSPACE_DEVFILE__REGISTRY__INTERNAL__URL",
-				Value: fmt.Sprintf("http://%s.%s.svc:8080", constants.DevfileRegistryName, ctx.CheCluster.Namespace)},
-		)
-	}
-
 	if !ctx.CheCluster.Spec.Components.PluginRegistry.DisableInternalRegistry {
 		envVars = append(envVars,
 			corev1.EnvVar{
diff --git a/pkg/deploy/devfileregistry/devfileregistry.go b/pkg/deploy/devfileregistry/devfileregistry.go
index 755ebfc605..a5c6a99aca 100644
--- a/pkg/deploy/devfileregistry/devfileregistry.go
+++ b/pkg/deploy/devfileregistry/devfileregistry.go
@@ -13,19 +13,26 @@
 package devfileregistry
 
 import (
-	"fmt"
+	"context"
+	"encoding/json"
 
+	v2 "github.com/eclipse-che/che-operator/api/v2"
+	defaults "github.com/eclipse-che/che-operator/pkg/common/operator-defaults"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	ctrl "sigs.k8s.io/controller-runtime"
 
 	"github.com/eclipse-che/che-operator/pkg/common/chetypes"
 	"github.com/eclipse-che/che-operator/pkg/common/constants"
 	"github.com/eclipse-che/che-operator/pkg/deploy"
-	"github.com/eclipse-che/che-operator/pkg/deploy/expose"
 	"github.com/eclipse-che/che-operator/pkg/deploy/gateway"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
+var (
+	logger = ctrl.Log.WithName("devfile-registry")
+)
+
 type DevfileRegistryReconciler struct {
 	deploy.Reconcilable
 }
@@ -35,44 +42,45 @@ func NewDevfileRegistryReconciler() *DevfileRegistryReconciler {
 }
 
 func (d *DevfileRegistryReconciler) Reconcile(ctx *chetypes.DeployContext) (reconcile.Result, bool, error) {
-	if ctx.CheCluster.Spec.Components.DevfileRegistry.DisableInternalRegistry {
-		_, _ = deploy.DeleteNamespacedObject(ctx, constants.DevfileRegistryName, &corev1.Service{})
-		_, _ = deploy.DeleteNamespacedObject(ctx, constants.DevfileRegistryName, &corev1.ConfigMap{})
-		_, _ = deploy.DeleteNamespacedObject(ctx, gateway.GatewayConfigMapNamePrefix+constants.DevfileRegistryName, &corev1.ConfigMap{})
-		_, _ = deploy.DeleteNamespacedObject(ctx, constants.DevfileRegistryName, &appsv1.Deployment{})
-
-		if ctx.CheCluster.Status.DevfileRegistryURL != "" {
-			ctx.CheCluster.Status.DevfileRegistryURL = ""
-			err := deploy.UpdateCheCRStatus(ctx, "DevfileRegistryURL", "")
-			return reconcile.Result{}, err == nil, err
+	_, _ = deploy.DeleteNamespacedObject(ctx, constants.DevfileRegistryName, &corev1.Service{})
+	_, _ = deploy.DeleteNamespacedObject(ctx, constants.DevfileRegistryName, &corev1.ConfigMap{})
+	_, _ = deploy.DeleteNamespacedObject(ctx, gateway.GatewayConfigMapNamePrefix+constants.DevfileRegistryName, &corev1.ConfigMap{})
+	_, _ = deploy.DeleteNamespacedObject(ctx, constants.DevfileRegistryName, &appsv1.Deployment{})
+
+	if ctx.CheCluster.Status.DevfileRegistryURL != "" {
+		var externalDevfileRegistries []v2.ExternalDevfileRegistry
+		if err := json.Unmarshal([]byte(defaults.GetDevfileRegistryExternalDevfileRegistries()), &externalDevfileRegistries); err == nil {
+
+			// Add default external devfile registries to the CheCluster CR
+			for _, newRegistry := range externalDevfileRegistries {
+				newRegistryAlreadyExists := false
+				for _, existedRegistry := range ctx.CheCluster.Spec.Components.DevfileRegistry.ExternalDevfileRegistries {
+					if existedRegistry.Url == newRegistry.Url {
+						newRegistryAlreadyExists = true
+						break
+					}
+				}
+
+				if !newRegistryAlreadyExists {
+					logger.Info("Adding external devfile registry to the CheCluster CR", "Url", newRegistry.Url)
+					ctx.CheCluster.Spec.Components.DevfileRegistry.ExternalDevfileRegistries =
+						append(ctx.CheCluster.Spec.Components.DevfileRegistry.ExternalDevfileRegistries, newRegistry)
+				}
+			}
+
+			if err := ctx.ClusterAPI.Client.Update(context.TODO(), ctx.CheCluster); err != nil {
+				return reconcile.Result{}, false, err
+			}
+		} else {
+			logger.Error(
+				err, "Failed to unmarshal environment variable",
+				"key", "CHE_OPERATOR_DEFAULTS_DEVFILE_REGISTRY_EXTERNAL_DEVFILE_REGISTRIES",
+				"value", defaults.GetDevfileRegistryExternalDevfileRegistries(),
+			)
 		}
 
-		return reconcile.Result{}, true, nil
-	}
-
-	done, err := d.syncService(ctx)
-	if !done {
-		return reconcile.Result{}, false, err
-	}
-
-	endpoint, done, err := d.exposeEndpoint(ctx)
-	if !done {
-		return reconcile.Result{}, false, err
-	}
-
-	done, err = d.updateStatus(endpoint, ctx)
-	if !done {
-		return reconcile.Result{}, false, err
-	}
-
-	done, err = d.syncConfigMap(ctx)
-	if !done {
-		return reconcile.Result{}, false, err
-	}
-
-	done, err = d.syncDeployment(ctx)
-	if !done {
-		return reconcile.Result{}, false, err
+		ctx.CheCluster.Status.DevfileRegistryURL = ""
+		_ = deploy.UpdateCheCRStatus(ctx, "DevfileRegistryURL", "")
 	}
 
 	return reconcile.Result{}, true, nil
@@ -81,59 +89,3 @@ func (d *DevfileRegistryReconciler) Reconcile(ctx *chetypes.DeployContext) (reco
 func (d *DevfileRegistryReconciler) Finalize(ctx *chetypes.DeployContext) bool {
 	return true
 }
-
-func (d *DevfileRegistryReconciler) syncService(ctx *chetypes.DeployContext) (bool, error) {
-	return deploy.SyncServiceToCluster(
-		ctx,
-		constants.DevfileRegistryName,
-		[]string{"http"},
-		[]int32{8080},
-		constants.DevfileRegistryName)
-}
-
-func (d *DevfileRegistryReconciler) syncConfigMap(ctx *chetypes.DeployContext) (bool, error) {
-	data, err := d.getConfigMapData(ctx)
-	if err != nil {
-		return false, err
-	}
-	return deploy.SyncConfigMapDataToCluster(ctx, constants.DevfileRegistryName, data, constants.DevfileRegistryName)
-}
-
-func (d *DevfileRegistryReconciler) exposeEndpoint(ctx *chetypes.DeployContext) (string, bool, error) {
-	return expose.Expose(
-		ctx,
-		constants.DevfileRegistryName,
-		d.createGatewayConfig())
-}
-
-func (d *DevfileRegistryReconciler) updateStatus(endpoint string, ctx *chetypes.DeployContext) (bool, error) {
-	devfileRegistryURL := "https://" + endpoint
-	if devfileRegistryURL != ctx.CheCluster.Status.DevfileRegistryURL {
-		ctx.CheCluster.Status.DevfileRegistryURL = devfileRegistryURL
-		if err := deploy.UpdateCheCRStatus(ctx, "status: Devfile Registry URL", devfileRegistryURL); err != nil {
-			return false, err
-		}
-	}
-
-	return true, nil
-}
-
-func (d *DevfileRegistryReconciler) syncDeployment(ctx *chetypes.DeployContext) (bool, error) {
-	if spec, err := d.getDevfileRegistryDeploymentSpec(ctx); err != nil {
-		return false, err
-	} else {
-		return deploy.SyncDeploymentSpecToCluster(ctx, spec, deploy.DefaultDeploymentDiffOpts)
-	}
-}
-
-func (d *DevfileRegistryReconciler) createGatewayConfig() *gateway.TraefikConfig {
-	pathPrefix := "/" + constants.DevfileRegistryName
-	cfg := gateway.CreateCommonTraefikConfig(
-		constants.DevfileRegistryName,
-		fmt.Sprintf("PathPrefix(`%s`)", pathPrefix),
-		10,
-		"http://"+constants.DevfileRegistryName+":8080",
-		[]string{pathPrefix})
-
-	return cfg
-}
diff --git a/pkg/deploy/devfileregistry/devfileregistry_configmap.go b/pkg/deploy/devfileregistry/devfileregistry_configmap.go
deleted file mode 100644
index 49b519ffee..0000000000
--- a/pkg/deploy/devfileregistry/devfileregistry_configmap.go
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// Copyright (c) 2019-2023 Red Hat, Inc.
-// This program and the accompanying materials are made
-// available under the terms of the Eclipse Public License 2.0
-// which is available at https://www.eclipse.org/legal/epl-2.0/
-//
-// SPDX-License-Identifier: EPL-2.0
-//
-// Contributors:
-//   Red Hat, Inc. - initial API and implementation
-//
-
-package devfileregistry
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/eclipse-che/che-operator/pkg/common/constants"
-
-	"github.com/eclipse-che/che-operator/pkg/common/chetypes"
-)
-
-type DevFileRegistryConfigMap struct {
-	CheDevfileImagesRegistryURL          string `json:"CHE_DEVFILE_IMAGES_REGISTRY_URL"`
-	CheDevfileImagesRegistryOrganization string `json:"CHE_DEVFILE_IMAGES_REGISTRY_ORGANIZATION"`
-	CheDevfileRegistryURL                string `json:"CHE_DEVFILE_REGISTRY_URL"`
-	CheDevfileRegistryInternalURL        string `json:"CHE_DEVFILE_REGISTRY_INTERNAL_URL"`
-}
-
-func (d *DevfileRegistryReconciler) getConfigMapData(ctx *chetypes.DeployContext) (map[string]string, error) {
-	devfileRegistryEnv := make(map[string]string)
-	data := &DevFileRegistryConfigMap{
-		CheDevfileImagesRegistryURL:          ctx.CheCluster.Spec.ContainerRegistry.Hostname,
-		CheDevfileImagesRegistryOrganization: ctx.CheCluster.Spec.ContainerRegistry.Organization,
-		CheDevfileRegistryURL:                ctx.CheCluster.Status.DevfileRegistryURL,
-		CheDevfileRegistryInternalURL:        fmt.Sprintf("http://%s.%s.svc:8080", constants.DevfileRegistryName, ctx.CheCluster.Namespace),
-	}
-
-	out, err := json.Marshal(data)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal(out, &devfileRegistryEnv)
-	if err != nil {
-		return nil, err
-	}
-
-	return devfileRegistryEnv, nil
-}
diff --git a/pkg/deploy/devfileregistry/devfileregistry_deployment.go b/pkg/deploy/devfileregistry/devfileregistry_deployment.go
deleted file mode 100644
index bb53a82f5b..0000000000
--- a/pkg/deploy/devfileregistry/devfileregistry_deployment.go
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// Copyright (c) 2019-2023 Red Hat, Inc.
-// This program and the accompanying materials are made
-// available under the terms of the Eclipse Public License 2.0
-// which is available at https://www.eclipse.org/legal/epl-2.0/
-//
-// SPDX-License-Identifier: EPL-2.0
-//
-// Contributors:
-//   Red Hat, Inc. - initial API and implementation
-//
-
-package devfileregistry
-
-import (
-	"github.com/eclipse-che/che-operator/pkg/common/chetypes"
-	"github.com/eclipse-che/che-operator/pkg/common/constants"
-	defaults "github.com/eclipse-che/che-operator/pkg/common/operator-defaults"
-	"github.com/eclipse-che/che-operator/pkg/common/utils"
-	"github.com/eclipse-che/che-operator/pkg/deploy"
-	"github.com/eclipse-che/che-operator/pkg/deploy/registry"
-	appsv1 "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
-)
-
-func (d *DevfileRegistryReconciler) getDevfileRegistryDeploymentSpec(ctx *chetypes.DeployContext) (*appsv1.Deployment, error) {
-	registryType := "devfile"
-	registryImage := defaults.GetDevfileRegistryImage(ctx.CheCluster)
-	registryImagePullPolicy := v1.PullPolicy(utils.GetPullPolicyFromDockerImage(registryImage))
-	probePath := "/devfiles/"
-	devfileImagesEnv := utils.GetGetArchitectureDependentEnvsByRegExp("^.*devfile_registry_image.*$")
-
-	resources := v1.ResourceRequirements{
-		Requests: v1.ResourceList{
-			v1.ResourceMemory: resource.MustParse(constants.DefaultDevfileRegistryMemoryRequest),
-			v1.ResourceCPU:    resource.MustParse(constants.DefaultDevfileRegistryCpuRequest),
-		},
-		Limits: v1.ResourceList{
-			v1.ResourceMemory: resource.MustParse(constants.DefaultDevfileRegistryMemoryLimit),
-			v1.ResourceCPU:    resource.MustParse(constants.DefaultDevfileRegistryCpuLimit),
-		},
-	}
-
-	deployment := registry.GetSpecRegistryDeployment(
-		ctx,
-		registryType,
-		registryImage,
-		devfileImagesEnv,
-		registryImagePullPolicy,
-		resources,
-		probePath)
-
-	deploy.EnsurePodSecurityStandards(deployment, constants.DefaultSecurityContextRunAsUser, constants.DefaultSecurityContextFsGroup)
-	if err := deploy.OverrideDeployment(ctx, deployment, ctx.CheCluster.Spec.Components.DevfileRegistry.Deployment); err != nil {
-		return nil, err
-	}
-	return deployment, nil
-}
diff --git a/pkg/deploy/devfileregistry/devfileregistry_deployment_test.go b/pkg/deploy/devfileregistry/devfileregistry_deployment_test.go
deleted file mode 100644
index 7bf483ac03..0000000000
--- a/pkg/deploy/devfileregistry/devfileregistry_deployment_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-//
-// Copyright (c) 2019-2023 Red Hat, Inc.
-// This program and the accompanying materials are made
-// available under the terms of the Eclipse Public License 2.0
-// which is available at https://www.eclipse.org/legal/epl-2.0/
-//
-// SPDX-License-Identifier: EPL-2.0
-//
-// Contributors:
-//   Red Hat, Inc. - initial API and implementation
-//
-
-package devfileregistry
-
-import (
-	"os"
-
-	"github.com/stretchr/testify/assert"
-
-	"k8s.io/apimachinery/pkg/api/resource"
-
-	"github.com/eclipse-che/che-operator/pkg/common/constants"
-	"github.com/eclipse-che/che-operator/pkg/common/test"
-
-	chev2 "github.com/eclipse-che/che-operator/api/v2"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-
-	"testing"
-)
-
-func TestGetDevfileRegistryDeploymentSpec(t *testing.T) {
-	memoryRequest := resource.MustParse("150Mi")
-	cpuRequest := resource.MustParse("150m")
-	memoryLimit := resource.MustParse("250Mi")
-	cpuLimit := resource.MustParse("250m")
-
-	type testCase struct {
-		name          string
-		initObjects   []runtime.Object
-		memoryLimit   string
-		memoryRequest string
-		cpuRequest    string
-		cpuLimit      string
-		cheCluster    *chev2.CheCluster
-	}
-
-	testCases := []testCase{
-		{
-			name:          "Test default limits",
-			initObjects:   []runtime.Object{},
-			memoryLimit:   constants.DefaultDevfileRegistryMemoryLimit,
-			memoryRequest: constants.DefaultDevfileRegistryMemoryRequest,
-			cpuLimit:      "0", // CPU limit is not set when possible
-			cpuRequest:    constants.DefaultDevfileRegistryCpuRequest,
-			cheCluster: &chev2.CheCluster{
-				ObjectMeta: metav1.ObjectMeta{
-					Namespace: "eclipse-che",
-					Name:      "eclipse-che",
-				},
-			},
-		},
-		{
-			name:          "Test custom limits",
-			initObjects:   []runtime.Object{},
-			cpuLimit:      "250m",
-			cpuRequest:    "150m",
-			memoryLimit:   "250Mi",
-			memoryRequest: "150Mi",
-			cheCluster: &chev2.CheCluster{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "eclipse-che",
-					Namespace: "eclipse-che",
-				},
-				Spec: chev2.CheClusterSpec{
-					Components: chev2.CheClusterComponents{
-						DevfileRegistry: chev2.DevfileRegistry{
-							Deployment: &chev2.Deployment{
-								Containers: []chev2.Container{
-									{
-										Name: constants.DevfileRegistryName,
-										Resources: &chev2.ResourceRequirements{
-											Requests: &chev2.ResourceList{
-												Memory: &memoryRequest,
-												Cpu:    &cpuRequest,
-											},
-											Limits: &chev2.ResourceList{
-												Memory: &memoryLimit,
-												Cpu:    &cpuLimit,
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			logf.SetLogger(zap.New(zap.WriteTo(os.Stdout), zap.UseDevMode(true)))
-			ctx := test.GetDeployContext(testCase.cheCluster, []runtime.Object{})
-
-			devfileregistry := NewDevfileRegistryReconciler()
-			deployment, err := devfileregistry.getDevfileRegistryDeploymentSpec(ctx)
-			assert.NoError(t, err)
-
-			test.CompareResources(deployment,
-				test.TestExpectedResources{
-					MemoryLimit:   testCase.memoryLimit,
-					MemoryRequest: testCase.memoryRequest,
-					CpuRequest:    testCase.cpuRequest,
-					CpuLimit:      testCase.cpuLimit,
-				},
-				t)
-
-			test.ValidateSecurityContext(deployment, t)
-		})
-	}
-}
diff --git a/pkg/deploy/devfileregistry/devfileregistry_test.go b/pkg/deploy/devfileregistry/devfileregistry_test.go
index 40e816a932..21c3a53e30 100644
--- a/pkg/deploy/devfileregistry/devfileregistry_test.go
+++ b/pkg/deploy/devfileregistry/devfileregistry_test.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2023 Red Hat, Inc.
+// Copyright (c) 2019-2024 Red Hat, Inc.
 // This program and the accompanying materials are made
 // available under the terms of the Eclipse Public License 2.0
 // which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -13,112 +13,162 @@
 package devfileregistry
 
 import (
+	"testing"
+
 	"github.com/devfile/devworkspace-operator/pkg/infrastructure"
 	chev2 "github.com/eclipse-che/che-operator/api/v2"
 	"github.com/eclipse-che/che-operator/pkg/common/test"
 	"github.com/stretchr/testify/assert"
-	appsv1 "k8s.io/api/apps/v1"
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
-
-	"testing"
 )
 
-func TestDevfileRegistryReconcile(t *testing.T) {
-	infrastructure.InitializeForTesting(infrastructure.OpenShiftv4)
-
-	ctx := test.GetDeployContext(nil, []runtime.Object{})
-
-	devfileregistry := NewDevfileRegistryReconciler()
-	_, done, err := devfileregistry.Reconcile(ctx)
-	assert.True(t, done)
-	assert.Nil(t, err)
-
-	assert.True(t, test.IsObjectExists(ctx.ClusterAPI.Client, types.NamespacedName{Name: "devfile-registry", Namespace: "eclipse-che"}, &corev1.Service{}))
-	assert.True(t, test.IsObjectExists(ctx.ClusterAPI.Client, types.NamespacedName{Name: "devfile-registry", Namespace: "eclipse-che"}, &corev1.ConfigMap{}))
-	assert.True(t, test.IsObjectExists(ctx.ClusterAPI.Client, types.NamespacedName{Name: "devfile-registry", Namespace: "eclipse-che"}, &appsv1.Deployment{}))
-	assert.NotEmpty(t, ctx.CheCluster.Status.DevfileRegistryURL)
-}
-
-func TestShouldSetUpCorrectlyDevfileRegistryURL(t *testing.T) {
+func TestDevfileRegistryReconciler(t *testing.T) {
 	type testCase struct {
-		name                       string
-		initObjects                []runtime.Object
-		cheCluster                 *chev2.CheCluster
-		expectedDevfileRegistryURL string
+		name                              string
+		cheCluster                        *chev2.CheCluster
+		expectedDisableInternalRegistry   bool
+		expectedExternalDevfileRegistries []chev2.ExternalDevfileRegistry
+		expectedDevfileRegistryURL        string
 	}
 
 	testCases := []testCase{
 		{
-			name: "Test Status.DevfileRegistryURL #1",
+			name: "DisableInternalRegistry=false #1",
 			cheCluster: &chev2.CheCluster{
 				ObjectMeta: metav1.ObjectMeta{
-					Namespace: "eclipse-che",
 					Name:      "eclipse-che",
+					Namespace: "eclipse-che",
+				},
+				Spec: chev2.CheClusterSpec{
+					Components: chev2.CheClusterComponents{
+						DevfileRegistry: chev2.DevfileRegistry{
+							DisableInternalRegistry: false,
+						},
+					},
 				},
 				Status: chev2.CheClusterStatus{
-					CheURL: "https://che-host",
+					DevfileRegistryURL: "http://devfile-registry:8080",
 				},
 			},
-			expectedDevfileRegistryURL: "https://che-host/devfile-registry",
+			expectedDisableInternalRegistry:   false,
+			expectedExternalDevfileRegistries: []chev2.ExternalDevfileRegistry{{Url: "https://registry.devfile.io"}},
+			expectedDevfileRegistryURL:        "",
 		},
 		{
-			name: "Test Status.DevfileRegistryURL #2",
+			name: "DisableInternalRegistry=false #2",
 			cheCluster: &chev2.CheCluster{
 				ObjectMeta: metav1.ObjectMeta{
-					Namespace: "eclipse-che",
 					Name:      "eclipse-che",
+					Namespace: "eclipse-che",
 				},
 				Spec: chev2.CheClusterSpec{
 					Components: chev2.CheClusterComponents{
 						DevfileRegistry: chev2.DevfileRegistry{
+							DisableInternalRegistry: false,
 							ExternalDevfileRegistries: []chev2.ExternalDevfileRegistry{
-								{Url: "https://devfile-registry.external.2"},
+								{Url: "my-external-registry"},
 							},
 						},
 					},
 				},
 				Status: chev2.CheClusterStatus{
-					CheURL: "https://che-host",
+					DevfileRegistryURL: "http://devfile-registry:8080",
 				},
 			},
-			expectedDevfileRegistryURL: "https://che-host/devfile-registry",
+			expectedDisableInternalRegistry: false,
+			expectedExternalDevfileRegistries: []chev2.ExternalDevfileRegistry{
+				{Url: "my-external-registry"},
+				{Url: "https://registry.devfile.io"},
+			},
+			expectedDevfileRegistryURL: "",
 		},
 		{
-			name: "Test Status.DevfileRegistryURL #3",
+			name: "DisableInternalRegistry=false #3",
 			cheCluster: &chev2.CheCluster{
 				ObjectMeta: metav1.ObjectMeta{
-					Namespace: "eclipse-che",
 					Name:      "eclipse-che",
+					Namespace: "eclipse-che",
 				},
 				Spec: chev2.CheClusterSpec{
 					Components: chev2.CheClusterComponents{
 						DevfileRegistry: chev2.DevfileRegistry{
-							DisableInternalRegistry: true,
+							DisableInternalRegistry: false,
 							ExternalDevfileRegistries: []chev2.ExternalDevfileRegistry{
-								{Url: "https://devfile-registry.external.2"},
+								{Url: "https://registry.devfile.io"},
 							},
 						},
 					},
 				},
 				Status: chev2.CheClusterStatus{
-					CheURL: "https://che-host",
+					DevfileRegistryURL: "http://devfile-registry:8080",
 				},
 			},
+			expectedDisableInternalRegistry: false,
+			expectedExternalDevfileRegistries: []chev2.ExternalDevfileRegistry{
+				{Url: "https://registry.devfile.io"},
+			},
 			expectedDevfileRegistryURL: "",
 		},
+		{
+			name: "DisableInternalRegistry=true #1",
+			cheCluster: &chev2.CheCluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "eclipse-che",
+					Namespace: "eclipse-che",
+				},
+				Spec: chev2.CheClusterSpec{
+					Components: chev2.CheClusterComponents{
+						DevfileRegistry: chev2.DevfileRegistry{
+							DisableInternalRegistry: true,
+						},
+					},
+				},
+				Status: chev2.CheClusterStatus{},
+			},
+			expectedDisableInternalRegistry:   true,
+			expectedExternalDevfileRegistries: nil,
+			expectedDevfileRegistryURL:        "",
+		},
+		{
+			name: "DisableInternalRegistry=true #2",
+			cheCluster: &chev2.CheCluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "eclipse-che",
+					Namespace: "eclipse-che",
+				},
+				Spec: chev2.CheClusterSpec{
+					Components: chev2.CheClusterComponents{
+						DevfileRegistry: chev2.DevfileRegistry{
+							DisableInternalRegistry:   true,
+							ExternalDevfileRegistries: []chev2.ExternalDevfileRegistry{{Url: "my-external-registry"}},
+						},
+					},
+				},
+				Status: chev2.CheClusterStatus{},
+			},
+			expectedDisableInternalRegistry:   true,
+			expectedExternalDevfileRegistries: []chev2.ExternalDevfileRegistry{{Url: "my-external-registry"}},
+			expectedDevfileRegistryURL:        "",
+		},
 	}
 
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
+			infrastructure.InitializeForTesting(infrastructure.OpenShiftv4)
 			ctx := test.GetDeployContext(testCase.cheCluster, []runtime.Object{})
 
-			devfileregistry := NewDevfileRegistryReconciler()
-			devfileregistry.Reconcile(ctx)
+			devfileRegistryReconciler := NewDevfileRegistryReconciler()
+			for i := 0; i < 2; i++ {
+				_, done, err := devfileRegistryReconciler.Reconcile(ctx)
+				assert.True(t, done)
+				assert.Nil(t, err)
+			}
 
-			assert.Equal(t, ctx.CheCluster.Status.DevfileRegistryURL, testCase.expectedDevfileRegistryURL)
+			assert.Equal(t, testCase.expectedDevfileRegistryURL, ctx.CheCluster.Status.DevfileRegistryURL)
+			assert.Equal(t, testCase.expectedDisableInternalRegistry, ctx.CheCluster.Spec.Components.DevfileRegistry.DisableInternalRegistry)
+			assert.Equal(t, len(testCase.expectedExternalDevfileRegistries), len(ctx.CheCluster.Spec.Components.DevfileRegistry.ExternalDevfileRegistries))
+			assert.Equal(t, testCase.expectedExternalDevfileRegistries, ctx.CheCluster.Spec.Components.DevfileRegistry.ExternalDevfileRegistries)
 		})
 	}
 }
diff --git a/pkg/deploy/gateway/gateway_test.go b/pkg/deploy/gateway/gateway_test.go
index edad44a24f..e3ed9a69f6 100644
--- a/pkg/deploy/gateway/gateway_test.go
+++ b/pkg/deploy/gateway/gateway_test.go
@@ -153,9 +153,6 @@ func TestOauthProxyConfigUnauthorizedPaths(t *testing.T) {
 						PluginRegistry: chev2.PluginRegistry{
 							DisableInternalRegistry: true,
 						},
-						DevfileRegistry: chev2.DevfileRegistry{
-							DisableInternalRegistry: true,
-						},
 					}},
 			}, nil)
 
@@ -166,28 +163,7 @@ func TestOauthProxyConfigUnauthorizedPaths(t *testing.T) {
 		}
 	})
 
-	t.Run("no devfile-registry auth", func(t *testing.T) {
-		ctx := test.GetDeployContext(
-			&chev2.CheCluster{
-				Spec: chev2.CheClusterSpec{
-					Components: chev2.CheClusterComponents{
-						PluginRegistry: chev2.PluginRegistry{
-							DisableInternalRegistry: true,
-						},
-						DevfileRegistry: chev2.DevfileRegistry{
-							DisableInternalRegistry: false,
-						},
-					}},
-			}, nil)
-
-		configmap := getGatewayOauthProxyConfigSpec(ctx, "blabol")
-		config := configmap.Data["oauth-proxy.cfg"]
-		if !strings.Contains(config, "skip_auth_regex = \"^/devfile-registry|^/$|/healthz$|^/dashboard/static/preload|^/dashboard/assets/branding/loader.svg$\"") {
-			t.Error("oauth config should skip auth for devfile registry", config)
-		}
-	})
-
-	t.Run("skip plugin-registry auth", func(t *testing.T) {
+	t.Run("skip plugin registry", func(t *testing.T) {
 		ctx := test.GetDeployContext(
 			&chev2.CheCluster{
 				Spec: chev2.CheClusterSpec{
@@ -195,36 +171,12 @@ func TestOauthProxyConfigUnauthorizedPaths(t *testing.T) {
 						PluginRegistry: chev2.PluginRegistry{
 							DisableInternalRegistry: false,
 						},
-						DevfileRegistry: chev2.DevfileRegistry{
-							DisableInternalRegistry: true,
-						},
 					}},
 			}, nil)
 
 		configmap := getGatewayOauthProxyConfigSpec(ctx, "blabol")
 		config := configmap.Data["oauth-proxy.cfg"]
 		if !strings.Contains(config, "skip_auth_regex = \"^/plugin-registry|^/$|/healthz$|^/dashboard/static/preload|^/dashboard/assets/branding/loader.svg$\"") {
-			t.Error("oauth config should skip auth for plugin registry", config)
-		}
-	})
-
-	t.Run("skip both registries auth", func(t *testing.T) {
-		ctx := test.GetDeployContext(
-			&chev2.CheCluster{
-				Spec: chev2.CheClusterSpec{
-					Components: chev2.CheClusterComponents{
-						PluginRegistry: chev2.PluginRegistry{
-							DisableInternalRegistry: false,
-						},
-						DevfileRegistry: chev2.DevfileRegistry{
-							DisableInternalRegistry: false,
-						},
-					}},
-			}, nil)
-
-		configmap := getGatewayOauthProxyConfigSpec(ctx, "blabol")
-		config := configmap.Data["oauth-proxy.cfg"]
-		if !strings.Contains(config, "skip_auth_regex = \"^/plugin-registry|^/devfile-registry|^/$|/healthz$|^/dashboard/static/preload|^/dashboard/assets/branding/loader.svg$\"") {
 			t.Error("oauth config should skip auth for plugin and devfile registry.", config)
 		}
 	})
diff --git a/pkg/deploy/gateway/oauth_proxy.go b/pkg/deploy/gateway/oauth_proxy.go
index bc13058b72..771adf69b5 100644
--- a/pkg/deploy/gateway/oauth_proxy.go
+++ b/pkg/deploy/gateway/oauth_proxy.go
@@ -163,9 +163,6 @@ func skipAuthConfig(instance *chev2.CheCluster) string {
 	if !instance.Spec.Components.PluginRegistry.DisableInternalRegistry {
 		skipAuthPaths = append(skipAuthPaths, "^/"+constants.PluginRegistryName)
 	}
-	if !instance.Spec.Components.DevfileRegistry.DisableInternalRegistry {
-		skipAuthPaths = append(skipAuthPaths, "^/"+constants.DevfileRegistryName)
-	}
 	skipAuthPaths = append(skipAuthPaths, "^/$")
 	skipAuthPaths = append(skipAuthPaths, "/healthz$")
 	skipAuthPaths = append(skipAuthPaths, "^/dashboard/static/preload")
diff --git a/pkg/deploy/image-puller/imagepuller.go b/pkg/deploy/image-puller/imagepuller.go
index 62a10063e9..8b35e91714 100644
--- a/pkg/deploy/image-puller/imagepuller.go
+++ b/pkg/deploy/image-puller/imagepuller.go
@@ -14,11 +14,8 @@ package imagepuller
 
 import (
 	"fmt"
-	"io"
-	"net/http"
 	"sort"
 	"strings"
-	"time"
 
 	"k8s.io/apimachinery/pkg/util/validation"
 
@@ -132,7 +129,7 @@ func (ip *ImagePuller) syncKubernetesImagePuller(ctx *chetypes.DeployContext) (b
 	imagePuller.Spec.DeploymentName = utils.GetValue(imagePuller.Spec.DeploymentName, defaultDeploymentName)
 	imagePuller.Spec.ImagePullerImage = utils.GetValue(imagePuller.Spec.ImagePullerImage, defaultImagePullerImage)
 	if strings.TrimSpace(imagePuller.Spec.Images) == "" {
-		imagePuller.Spec.Images = getDefaultImages(ctx)
+		imagePuller.Spec.Images = getDefaultImages()
 	}
 
 	return deploy.SyncWithClient(ctx.ClusterAPI.NonCachingClient, ctx, imagePuller, kubernetesImagePullerDiffOpts)
@@ -142,10 +139,9 @@ func getImagePullerCustomResourceName(ctx *chetypes.DeployContext) string {
 	return ctx.CheCluster.Name + "-image-puller"
 }
 
-func getDefaultImages(ctx *chetypes.DeployContext) string {
+func getDefaultImages() string {
 	allImages := make(map[string]bool)
 
-	addImagesFromRegistries(ctx, allImages)
 	addImagesFromEditorsDefinitions(allImages)
 
 	// having them sorted, prevents from constant changing CR spec
@@ -153,39 +149,6 @@ func getDefaultImages(ctx *chetypes.DeployContext) string {
 	return convertToSpecField(sortedImages)
 }
 
-func collectRegistriesUrls(ctx *chetypes.DeployContext) []string {
-	urls := make([]string, 0)
-
-	if ctx.CheCluster.Status.DevfileRegistryURL != "" {
-		urls = append(
-			urls,
-			fmt.Sprintf(
-				"http://%s.%s.svc:8080/%s",
-				constants.DevfileRegistryName,
-				ctx.CheCluster.Namespace,
-				"devfiles/external_images.txt",
-			),
-		)
-	}
-
-	return urls
-}
-
-func addImagesFromRegistries(ctx *chetypes.DeployContext, allImages map[string]bool) {
-	urls := collectRegistriesUrls(ctx)
-
-	for _, url := range urls {
-		images, err := fetchImagesFromUrl(url, ctx)
-		if err != nil {
-			log.Error(err, fmt.Sprintf("Failed to fetch images from %s", url))
-		} else {
-			for image := range images {
-				allImages[image] = true
-			}
-		}
-	}
-}
-
 func addImagesFromEditorsDefinitions(allImages map[string]bool) {
 	envs := utils.GetEnvsByRegExp("RELATED_IMAGE_editor_definition_.*")
 	for _, env := range envs {
@@ -223,47 +186,6 @@ func convertToSpecField(images []string) string {
 	return specField
 }
 
-func fetchImagesFromUrl(url string, ctx *chetypes.DeployContext) (map[string]bool, error) {
-	transport := &http.Transport{}
-	if ctx.Proxy.HttpProxy != "" {
-		deploy.ConfigureProxy(ctx, transport)
-	}
-
-	client := &http.Client{
-		Transport: transport,
-		Timeout:   time.Second * 3,
-	}
-
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return map[string]bool{}, err
-	}
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return map[string]bool{}, err
-	}
-
-	data, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return map[string]bool{}, err
-	}
-
-	images := make(map[string]bool)
-	for _, image := range strings.Split(string(data), "\n") {
-		image = strings.TrimSpace(image)
-		if image != "" {
-			images[image] = true
-		}
-	}
-
-	if err = resp.Body.Close(); err != nil {
-		log.Error(err, "Failed to close a body response")
-	}
-
-	return images, nil
-}
-
 // convertToRFC1123 converts input string to RFC 1123 format ([a-z0-9]([-a-z0-9]*[a-z0-9])?) max 63 characters, if possible
 func convertToRFC1123(str string) (string, error) {
 	result := strings.ToLower(str)
diff --git a/pkg/deploy/image-puller/imagepuller_test.go b/pkg/deploy/image-puller/imagepuller_test.go
index c27d797bfe..974ba561aa 100644
--- a/pkg/deploy/image-puller/imagepuller_test.go
+++ b/pkg/deploy/image-puller/imagepuller_test.go
@@ -51,7 +51,7 @@ func TestImagePullerConfiguration(t *testing.T) {
 				DeploymentName:   defaultDeploymentName,
 				ConfigMapName:    defaultConfigMapName,
 				ImagePullerImage: defaultImagePullerImage,
-				Images:           getDefaultImages(test.GetDeployContext(nil, []runtime.Object{})),
+				Images:           getDefaultImages(),
 			}),
 		},
 		{
@@ -87,7 +87,7 @@ func TestImagePullerConfiguration(t *testing.T) {
 				DeploymentName:   defaultDeploymentName,
 				ConfigMapName:    defaultConfigMapName,
 				ImagePullerImage: defaultImagePullerImage,
-				Images:           getDefaultImages(test.GetDeployContext(nil, []runtime.Object{})),
+				Images:           getDefaultImages(),
 			}),
 		},
 		{
diff --git a/pkg/deploy/ingress.go b/pkg/deploy/ingress.go
index a8cf4208e8..46d03f4b16 100644
--- a/pkg/deploy/ingress.go
+++ b/pkg/deploy/ingress.go
@@ -187,8 +187,6 @@ func GetIngressSpec(
 // and endpoint path (one which client should use during endpoint accessing)
 func evaluatePath(component string) (endpointPath, ingressPath string) {
 	switch component {
-	case constants.DevfileRegistryName:
-		fallthrough
 	case constants.PluginRegistryName:
 		endpointPath = "/" + component
 		ingressPath = endpointPath + "/(.*)"
diff --git a/pkg/deploy/migration/checluster-defaults-cleanupfunc.go b/pkg/deploy/migration/checluster-defaults-cleanupfunc.go
index ce83a7c3b1..0854d72485 100644
--- a/pkg/deploy/migration/checluster-defaults-cleanupfunc.go
+++ b/pkg/deploy/migration/checluster-defaults-cleanupfunc.go
@@ -140,7 +140,6 @@ func cleanUpContainersResources(ctx *chetypes.DeployContext) (bool, error) {
 	deployments := []*chev2.Deployment{
 		ctx.CheCluster.Spec.Components.CheServer.Deployment,
 		ctx.CheCluster.Spec.Components.PluginRegistry.Deployment,
-		ctx.CheCluster.Spec.Components.DevfileRegistry.Deployment,
 		ctx.CheCluster.Spec.Components.Dashboard.Deployment,
 		ctx.CheCluster.Spec.Networking.Auth.Gateway.Deployment,
 	}
diff --git a/pkg/deploy/server/server_configmap.go b/pkg/deploy/server/server_configmap.go
index 99e822a034..14f7575ef0 100644
--- a/pkg/deploy/server/server_configmap.go
+++ b/pkg/deploy/server/server_configmap.go
@@ -62,8 +62,6 @@ type CheConfigMap struct {
 	JavaOpts                             string `json:"JAVA_OPTS"`
 	PluginRegistryUrl                    string `json:"CHE_WORKSPACE_PLUGIN__REGISTRY__URL,omitempty"`
 	PluginRegistryInternalUrl            string `json:"CHE_WORKSPACE_PLUGIN__REGISTRY__INTERNAL__URL,omitempty"`
-	DevfileRegistryUrl                   string `json:"CHE_WORKSPACE_DEVFILE__REGISTRY__URL,omitempty"`
-	DevfileRegistryInternalUrl           string `json:"CHE_WORKSPACE_DEVFILE__REGISTRY__INTERNAL__URL,omitempty"`
 	CheJGroupsKubernetesLabels           string `json:"KUBERNETES_LABELS,omitempty"`
 	CheTrustedCABundlesConfigMap         string `json:"CHE_TRUSTED__CA__BUNDLES__CONFIGMAP,omitempty"`
 	ServerStrategy                       string `json:"CHE_INFRA_KUBERNETES_SERVER__STRATEGY"`
@@ -112,16 +110,6 @@ func (s *CheServerReconciler) getCheConfigMapData(ctx *chetypes.DeployContext) (
 
 	ingressClass := utils.GetValue(ctx.CheCluster.Spec.Networking.Annotations["kubernetes.io/ingress.class"], constants.DefaultIngressClass)
 
-	// grab first the devfile registry url which is deployed by operator
-	devfileRegistryURL := ctx.CheCluster.Status.DevfileRegistryURL
-
-	for _, r := range ctx.CheCluster.Spec.Components.DevfileRegistry.ExternalDevfileRegistries {
-		if strings.Index(devfileRegistryURL, r.Url) == -1 {
-			devfileRegistryURL += " " + r.Url
-		}
-	}
-	devfileRegistryURL = strings.TrimSpace(devfileRegistryURL)
-
 	pluginRegistryURL := ctx.CheCluster.Status.PluginRegistryURL
 	for _, r := range ctx.CheCluster.Spec.Components.PluginRegistry.ExternalPluginRegistries {
 		if strings.Index(pluginRegistryURL, r.Url) == -1 {
@@ -152,12 +140,7 @@ func (s *CheServerReconciler) getCheConfigMapData(ctx *chetypes.DeployContext) (
 	}
 
 	cheAPI := "https://" + ctx.CheHost + "/api"
-	var pluginRegistryInternalURL, devfileRegistryInternalURL string
-
-	// If there is a devfile registry deployed by operator
-	if !ctx.CheCluster.Spec.Components.DevfileRegistry.DisableInternalRegistry {
-		devfileRegistryInternalURL = fmt.Sprintf("http://%s.%s.svc:8080", constants.DevfileRegistryName, ctx.CheCluster.Namespace)
-	}
+	var pluginRegistryInternalURL string
 
 	if !ctx.CheCluster.Spec.Components.PluginRegistry.DisableInternalRegistry {
 		pluginRegistryInternalURL = fmt.Sprintf("http://%s.%s.svc:8080/v3", constants.PluginRegistryName, ctx.CheCluster.Namespace)
@@ -188,8 +171,6 @@ func (s *CheServerReconciler) getCheConfigMapData(ctx *chetypes.DeployContext) (
 		JavaOpts:                             constants.DefaultJavaOpts + " " + proxyJavaOpts,
 		PluginRegistryUrl:                    pluginRegistryURL,
 		PluginRegistryInternalUrl:            pluginRegistryInternalURL,
-		DevfileRegistryUrl:                   devfileRegistryURL,
-		DevfileRegistryInternalUrl:           devfileRegistryInternalURL,
 		CheJGroupsKubernetesLabels:           cheLabels,
 		CheMetricsEnabled:                    cheMetrics,
 		CheTrustedCABundlesConfigMap:         deploytls.CheAllCACertsConfigMapName,
diff --git a/pkg/deploy/server/server_configmap_test.go b/pkg/deploy/server/server_configmap_test.go
index da5e76dbe5..ce27683e03 100644
--- a/pkg/deploy/server/server_configmap_test.go
+++ b/pkg/deploy/server/server_configmap_test.go
@@ -312,90 +312,6 @@ func TestUpdateIntegrationServerEndpoints(t *testing.T) {
 	}
 }
 
-func TestShouldSetUpCorrectlyDevfileRegistryURL(t *testing.T) {
-	type testCase struct {
-		name         string
-		initObjects  []runtime.Object
-		cheCluster   *chev2.CheCluster
-		expectedData map[string]string
-	}
-
-	testCases := []testCase{
-		{
-			name: "Test #1",
-			cheCluster: &chev2.CheCluster{
-				ObjectMeta: metav1.ObjectMeta{
-					Namespace: "eclipse-che",
-				},
-				Spec: chev2.CheClusterSpec{
-					Components: chev2.CheClusterComponents{
-						DevfileRegistry: chev2.DevfileRegistry{
-							DisableInternalRegistry: true,
-							ExternalDevfileRegistries: []chev2.ExternalDevfileRegistry{
-								{Url: "external-plugin-registry"},
-							},
-						},
-					},
-				},
-			},
-			expectedData: map[string]string{
-				"CHE_WORKSPACE_DEVFILE__REGISTRY__URL":           "external-plugin-registry",
-				"CHE_WORKSPACE_DEVFILE__REGISTRY__INTERNAL__URL": "",
-			},
-		},
-		{
-			name: "Test #2",
-			cheCluster: &chev2.CheCluster{
-				ObjectMeta: metav1.ObjectMeta{
-					Namespace: "eclipse-che",
-				},
-				Spec: chev2.CheClusterSpec{
-					Components: chev2.CheClusterComponents{
-						DevfileRegistry: chev2.DevfileRegistry{
-							ExternalDevfileRegistries: []chev2.ExternalDevfileRegistry{
-								{Url: "external-plugin-registry"},
-							},
-						},
-					},
-				},
-				Status: chev2.CheClusterStatus{
-					DevfileRegistryURL: "internal-plugin-registry",
-				},
-			},
-			expectedData: map[string]string{
-				"CHE_WORKSPACE_DEVFILE__REGISTRY__URL":           "internal-plugin-registry external-plugin-registry",
-				"CHE_WORKSPACE_DEVFILE__REGISTRY__INTERNAL__URL": "http://devfile-registry.eclipse-che.svc:8080",
-			},
-		},
-		{
-			name: "Test devfile registry urls #5",
-			cheCluster: &chev2.CheCluster{
-				ObjectMeta: metav1.ObjectMeta{
-					Namespace: "eclipse-che",
-				},
-				Status: chev2.CheClusterStatus{
-					DevfileRegistryURL: "internal-plugin-registry",
-				},
-			},
-			expectedData: map[string]string{
-				"CHE_WORKSPACE_DEVFILE__REGISTRY__INTERNAL__URL": "http://devfile-registry.eclipse-che.svc:8080",
-				"CHE_WORKSPACE_DEVFILE__REGISTRY__URL":           "internal-plugin-registry",
-			},
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			ctx := test.GetDeployContext(testCase.cheCluster, []runtime.Object{})
-
-			server := NewCheServerReconciler()
-			actualData, err := server.getCheConfigMapData(ctx)
-			assert.Nil(t, err)
-			test.ValidateContainData(actualData, testCase.expectedData, t)
-		})
-	}
-}
-
 func TestShouldSetUpCorrectlyPluginRegistryURL(t *testing.T) {
 	type testCase struct {
 		name         string