diff --git a/.github/workflows/release-next-catalog-and-operator-image.yaml b/.github/workflows/release-next-catalog-and-operator-image.yaml
index 60a37926c..aba80409d 100644
--- a/.github/workflows/release-next-catalog-and-operator-image.yaml
+++ b/.github/workflows/release-next-catalog-and-operator-image.yaml
@@ -78,8 +78,10 @@ jobs:
           registry: quay.io
       - name: Build catalog source
         run: |
-          ${GITHUB_WORKSPACE}/build/scripts/release/addDigests.sh -s $(make csv-path CHANNEL=next) -t next
-          ${GITHUB_WORKSPACE}/build/scripts/olm/release-catalog.sh \
+          ./build/scripts/release/editors-definitions.sh add-env-vars
+          make update-dev-resources
+          ./build/scripts/release/addDigests.sh -s $(make csv-path CHANNEL=next) -t next
+          ./build/scripts/olm/release-catalog.sh \
             --channel next \
             --catalog-image quay.io/eclipse/eclipse-che-olm-catalog:next-digest \
             --bundle-image quay.io/eclipse/eclipse-che-olm-bundle:$(make bundle-version CHANNEL=next)-digest
diff --git a/build/scripts/release/addDigests.sh b/build/scripts/release/addDigests.sh
index 1b8e1a572..763637be5 100755
--- a/build/scripts/release/addDigests.sh
+++ b/build/scripts/release/addDigests.sh
@@ -94,7 +94,7 @@ do
     tagOrDigest="${source#*:}"
   fi
 
-  if [[ ${imageLabel} == "plugin-registry-image" ]] || [[ ${imageLabel} == "devfile-registry-image" ]]; then
+  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'.
diff --git a/build/scripts/release/buildDigestMap.sh b/build/scripts/release/buildDigestMap.sh
index cecd58b1b..bfe09e861 100755
--- a/build/scripts/release/buildDigestMap.sh
+++ b/build/scripts/release/buildDigestMap.sh
@@ -50,13 +50,6 @@ setOperatorImage() {
     OPERATOR_IMAGE=$(yq -r '.spec.install.spec.deployments[].spec.template.spec.containers[0].image' "${CSV}")
 }
 
-setPluginRegistryList() {
-    registry=$(yq -r '.spec.install.spec.deployments[].spec.template.spec.containers[].env[] | select(.name | test("RELATED_IMAGE_.*plugin_registry"; "g")) | .value' "${CSV}")
-    setRegistryImages "${registry}"
-
-    PLUGIN_REGISTRY_LIST=${registryImages}
-}
-
 setDevfileRegistryList() {
     registry=$(yq -r '.spec.install.spec.deployments[].spec.template.spec.containers[].env[] | select(.name | test("RELATED_IMAGE_.*devfile_registry"; "g")) | .value' "${CSV}")
 
@@ -150,9 +143,6 @@ setImagesFromDeploymentEnv
 setOperatorImage
 echo "${OPERATOR_IMAGE}"
 
-setPluginRegistryList
-echo "${PLUGIN_REGISTRY_LIST}"
-
 setDevfileRegistryList
 echo "${DEVFILE_REGISTRY_LIST}"
 
@@ -166,10 +156,6 @@ for image in ${REQUIRED_IMAGES}; do
   writeDigest "${image}" "required-image"
 done
 
-for image in ${PLUGIN_REGISTRY_LIST}; do
-  writeDigest "${image}" "plugin-registry-image"
-done
-
 for image in ${DEVFILE_REGISTRY_LIST}; do
   writeDigest "${image}" "devfile-registry-image"
 done