diff --git a/.devfile.yaml b/.devfile.yaml
index 202a82b9d7..decab89894 100644
--- a/.devfile.yaml
+++ b/.devfile.yaml
@@ -40,7 +40,7 @@ commands:
           mkdir output;
           BUILDER=podman SKIP_TEST=true SKIP_FORMAT=true SKIP_LINT=true NODE_BUILD_OPTIONS="-max-old-space-size=1024" ./build.sh &&
           export IMAGE=image-registry.openshift-image-registry.svc:5000/$(kubectl get sa default -o json | jq -r '.metadata.namespace')/che-plugin-registry &&
-          podman tag quay.io/devspaces/pluginregistry-rhel8:next ${IMAGE} &&
+          podman tag quay.io/devspaces/pluginregistry-rhel9:next ${IMAGE} &&
           podman login --tls-verify=false -u $(oc whoami | tr -d :) -p $(oc whoami -t) image-registry.openshift-image-registry.svc:5000 &&
           podman push --tls-verify=false "${IMAGE}"
   - id: configure-custom-plugin-registry
diff --git a/dependencies/che-plugin-registry/build.sh b/dependencies/che-plugin-registry/build.sh
index f8de0fb93e..d588602d96 100755
--- a/dependencies/che-plugin-registry/build.sh
+++ b/dependencies/che-plugin-registry/build.sh
@@ -240,7 +240,7 @@ if [ "${SKIP_OCI_IMAGE}" != "true" ]; then
     prepareOpenvsxPackagingAsset
 
     echo "Build with $BUILDER $BUILD_COMMAND"
-    IMAGE="${REGISTRY}/${ORGANIZATION}/pluginregistry-rhel8:${TAG}"
+    IMAGE="${REGISTRY}/${ORGANIZATION}/pluginregistry-rhel9:${TAG}"
     # Copy to root directory to behave as if in Brew or devspaces-images
     cp "${DOCKERFILE}" ./builder.Dockerfile
     ${BUILDER} ${BUILD_COMMAND} --progress=plain -t "${IMAGE}" -f ./builder.Dockerfile .
diff --git a/dependencies/che-plugin-registry/deploy/openshift/devspaces-plugin-registry.yaml b/dependencies/che-plugin-registry/deploy/openshift/devspaces-plugin-registry.yaml
index 9b3f213885..2b79b69b8b 100644
--- a/dependencies/che-plugin-registry/deploy/openshift/devspaces-plugin-registry.yaml
+++ b/dependencies/che-plugin-registry/deploy/openshift/devspaces-plugin-registry.yaml
@@ -115,10 +115,10 @@ objects:
       START_OPENVSX: ${START_OPENVSX}
 parameters:
   - name: IMAGE
-    value: registry.redhat.io/devspaces/pluginregistry-rhel8
+    value: registry.redhat.io/devspaces/pluginregistry-rhel9
     displayName: Red Hat OpenShift Dev Spaces plugin registry image
     description: Red Hat OpenShift Dev Spaces plugin registry container image. Defaults
-      to registry.redhat.io/devspaces/pluginregistry-rhel8
+      to registry.redhat.io/devspaces/pluginregistry-rhel9
   - name: IMAGE_TAG
     value: '3.18'
     displayName: Red Hat OpenShift Dev Spaces plugin registry version
diff --git a/product/buildInBrewCopyToQuay.sh b/product/buildInBrewCopyToQuay.sh
index 809d8ca4a0..c1b32ad65e 100755
--- a/product/buildInBrewCopyToQuay.sh
+++ b/product/buildInBrewCopyToQuay.sh
@@ -5,8 +5,8 @@
 # $➔ for d in $(ls -1 -d operator-*); do cd $d; { ../buildInBrewCopyToQuay.sh $d; }; cd ..; done
 
 # TODO should we invoke this and commit changes first?
-# /path/to/product/getLatestRPM.sh -s "$(pwd)" -r openshift-clients-4 -u https://rhsm-pulp.corp.redhat.com/content/dist/layered/rhel8/basearch/rhocp/4.7 -a "x86_64 s390x ppc64le" 
-# /path/to/product/getLatestRPM.sh -s "$(pwd)" -r helm-3 -u https://rhsm-pulp.corp.redhat.com/content/dist/layered/rhel8/basearch/ocp-tools/4.7 -a "x86_64 s390x ppc64le" 
+# /path/to/product/getLatestRPM.sh -s "$(pwd)" -r openshift-clients-4 -u https://rhsm-pulp.corp.redhat.com/content/dist/layered/rhel9/basearch/rhocp/4.7 -a "x86_64 s390x ppc64le" 
+# /path/to/product/getLatestRPM.sh -s "$(pwd)" -r helm-3 -u https://rhsm-pulp.corp.redhat.com/content/dist/layered/rhel9/basearch/ocp-tools/4.7 -a "x86_64 s390x ppc64le" 
 
 # try to compute branches from currently checked out branch; else fall back to hard coded value
 # where to find redhat-developer/devspaces/${DWNSTM_BRANCH}/product/getLatestImageTags.sh
@@ -77,7 +77,7 @@ if [[ $brewTaskID ]]; then
   google-chrome "https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=${brewTaskID}"
   brew watch-logs ${brewTaskID} | tee /tmp/${brewTaskID}.txt
 
-  container="devspaces-${IMG}-rhel8"
+  container="devspaces-${IMG}-rhel9"
   if [[ $container == *"operator"* ]]; then container="devspaces-${IMG}"; fi # special case for operator & metadata images
 
   grep -E "registry.access.redhat.com/devspaces/.+/images/${DS_VERSION}-[0-9]+" /tmp/${brewTaskID}.txt | \
diff --git a/product/checkImagesInCSV.sh b/product/checkImagesInCSV.sh
index 795e450fdc..7a409ce2ff 100755
--- a/product/checkImagesInCSV.sh
+++ b/product/checkImagesInCSV.sh
@@ -59,8 +59,8 @@ Examples:
 
 To compare latest image in Quay to latest CSV in bundle in latest IIB:
   TAG=$PROD_VER; \\
-  IMG=devspaces/dashboard-rhel8; \\
-  IMG=devspaces/pluginregistry-rhel8; \\
+  IMG=devspaces/dashboard-rhel9; \\
+  IMG=devspaces/pluginregistry-rhel9; \\
   img_quay=\$(${SCRIPTPATH}/getLatestImageTags.sh -b devspaces-\${TAG}-rhel-9 --quay --tag \"\${TAG}-\" -c \${IMG}); echo \$img_quay; \\
   img_iib=\$(${SCRIPTPATH}/checkImagesInCSV.sh --ds -t \${TAG} -o 4.12 -y -qq -i \${IMG}); echo \$img_iib; \\
   if [[ \$img_quay != \$img_iib ]]; then \\
@@ -141,9 +141,9 @@ for imageAndTag in $IMAGES; do
               elif [[ $BREW -eq 1 ]]; then # check brew registry
                 # NOTE: could use registry-proxy.engineering.redhat.com/rh-osbs/ instead but that's internal facing, 
                 # where brew.reg is auth'd and public
-                # convert registry.redhat.io/devworkspace/devworkspace-rhel8-operator
+                # convert registry.redhat.io/devworkspace/devworkspace-rhel9-operator
                 # to      brew.registry.redhat.io/rh-osbs/devworkspace-operator
-                related_image=$(echo $related_image | sed -r -e "s#registry.redhat.io/.+/#brew.registry.redhat.io/rh-osbs/#" -e "s#-rhel8##g")
+                related_image=$(echo $related_image | sed -r -e "s#registry.redhat.io/.+/#brew.registry.redhat.io/rh-osbs/#" -e "s#-rhel9##g")
                 jqdump="$(skopeo inspect docker://${related_image} 2>&1)"
                 if [[ $jqdump == *"Labels"* ]]; then 
                     tag=$(echo $jqdump | jq -r '.Labels.url' | sed -r -e "s#.+/images/##")
diff --git a/product/collectBuildInfo.sh b/product/collectBuildInfo.sh
index 57d54d6231..3aae26f639 100755
--- a/product/collectBuildInfo.sh
+++ b/product/collectBuildInfo.sh
@@ -84,7 +84,7 @@ getContainerFromTaskID () {
 
 getContainerFromBuildID () {
 # brew buildinfo 2203173 | grep Extra | sed -r -e "s@Extra: @@" | yq -r '.image.index.pull[]' | grep -v sha256
-# registry-proxy.engineering.redhat.com/rh-osbs/devspaces-code-rhel8:3.3-6
+# registry-proxy.engineering.redhat.com/rh-osbs/devspaces-code-rhel9:3.3-6
     buildid=$1
     container=$(brew buildinfo $buildid | grep Extra | sed -r -e "s@Extra: @@" | yq -r '.image.index.pull[]' | grep -v sha256 \
         | sed -r -e "s@registry-proxy.engineering.redhat.com/rh-osbs/@@")
diff --git a/product/containerExtract.sh b/product/containerExtract.sh
index a29cd5b7ec..598a3934d4 100755
--- a/product/containerExtract.sh
+++ b/product/containerExtract.sh
@@ -21,7 +21,7 @@ usage ()
 Examples:
   $0 quay.io/devspaces/devspaces-operator-bundle:latest
   $0 quay.io/devworkspace/devworkspace-operator-bundle:next
-  $0 quay.io/devspaces/pluginregistry-rhel8:latest --tar-flags var/www/html/*/external_images.txt --arch ppc64le
+  $0 quay.io/devspaces/pluginregistry-rhel9:latest --tar-flags var/www/html/*/external_images.txt --arch ppc64le
 
 Options:
   --delete-before  remove any local images before attempting to pull and extract a new copy
diff --git a/product/copyImageToQuay.sh b/product/copyImageToQuay.sh
index da782326a8..ed36ea8dbe 100755
--- a/product/copyImageToQuay.sh
+++ b/product/copyImageToQuay.sh
@@ -69,7 +69,7 @@ for image in $images; do
         if [[ ${QUAYDEST} =~ .*(devworkspace-|)(rhel8-|)operator:.+ ]];        then QUAYDEST="devworkspace/devworkspace-rhel8-operator:${TAG}"; fi
     elif [[ $URLfrag == *"devspaces"* ]]; then
         if [[ ${QUAYDEST} == *"/operator-bundle:"* ]]; then QUAYDEST="devspaces/devspaces-operator-bundle:${TAG}"; fi
-        if [[ ${QUAYDEST} == *"/operator:"* ]];        then QUAYDEST="devspaces/devspaces-rhel8-operator:${TAG}"; fi
+        if [[ ${QUAYDEST} == *"/operator:"* ]];        then QUAYDEST="devspaces/devspaces-rhel9-operator:${TAG}"; fi
     else
         # replace /rh-osbs/foo-image with foo/image
         QUAYDEST=$(echo $QUAYDEST | sed -r -e "s#rh-osbs/([^-])-#\1/#g")
diff --git a/product/getCommitSHAForTag.sh b/product/getCommitSHAForTag.sh
index 689b389346..2c2de9a4b8 100755
--- a/product/getCommitSHAForTag.sh
+++ b/product/getCommitSHAForTag.sh
@@ -21,8 +21,8 @@ fi
 usage () {
 	echo "
 Usage: for 1 or more containers in quay or Pulp, compute the NVR, Build URL, and Source commit for that build. eg.,
-  $0  quay.io/devspaces/udi-rhel8:3.y-1 quay.io/devspaces/udi-rhel8:3.y-1 ...
-  $0  registry-proxy.engineering.redhat.com/rh-osbs/devspaces-udi-rhel8 -j 3.y -n 2      | show last 2 tags
+  $0  quay.io/devspaces/udi-rhel9:3.y-1 quay.io/devspaces/udi-rhel9:3.y-1 ...
+  $0  registry-proxy.engineering.redhat.com/rh-osbs/devspaces-udi-rhel9 -j 3.y -n 2      | show last 2 tags
 "
 exit
 }
@@ -65,7 +65,7 @@ fi
 for d in $CONTAINERS; do
 	echo
 	echo "$d"
-	d=${d/devspaces-3-rhel8-/} # special case for operator and metadata images
+	d=${d/devspaces-3-rhel9-/} # special case for operator and metadata images
 
 	#strip off the registry and just find the container name
 	dd=${d#*/}
@@ -77,13 +77,13 @@ for d in $CONTAINERS; do
 		candidateTagUsed="${candidateTag}"
 	fi
 
-	CONTNAME=${dd%%:${TAG}}; CONTNAME=${CONTNAME##*/}; CONTNAME=${CONTNAME%%-rhel8}
+	CONTNAME=${dd%%:${TAG}}; CONTNAME=${CONTNAME##*/}; CONTNAME=${CONTNAME%%-rhel9}
 	# echo "Search for $CONTNAME :: $TAG"
-	# echo "  brew list-tagged ${candidateTag} | grep -E \"${CONTNAME}-container|${CONTNAME}-rhel8-container\" | sed -r -e \"s#${candidateTagUsed}.+##\" | sort -V"
+	# echo "  brew list-tagged ${candidateTag} | grep -E \"${CONTNAME}-container|${CONTNAME}-rhel9-container\" | sed -r -e \"s#${candidateTagUsed}.+##\" | sort -V"
 	if [[ $TAG != ${dd} ]]; then
-		NVRs=$(brew list-tagged ${candidateTagUsed} | grep -E "${CONTNAME}-container|${CONTNAME}-rhel8-container" | sed -e "s#${candidateTagUsed}.\+##" | sort -V | grep ${TAG})
+		NVRs=$(brew list-tagged ${candidateTagUsed} | grep -E "${CONTNAME}-container|${CONTNAME}-rhel9-container" | sed -e "s#${candidateTagUsed}.\+##" | sort -V | grep ${TAG})
 	else
-		NVRs=$(brew list-tagged ${candidateTagUsed} | grep -E "${CONTNAME}-container|${CONTNAME}-rhel8-container" | sed -e "s#${candidateTagUsed}.\+##" | sort -Vr | head -${NUMTAGS})
+		NVRs=$(brew list-tagged ${candidateTagUsed} | grep -E "${CONTNAME}-container|${CONTNAME}-rhel9-container" | sed -e "s#${candidateTagUsed}.\+##" | sort -Vr | head -${NUMTAGS})
 	fi
 	for NVR in $NVRs; do
 		echo "     NVR: $NVR"
diff --git a/product/getLatestImageTags.sh b/product/getLatestImageTags.sh
index a8e1e6a8d9..cbc800899d 100755
--- a/product/getLatestImageTags.sh
+++ b/product/getLatestImageTags.sh
@@ -71,20 +71,20 @@ checkVersion() {
 checkVersion 1.1 "$(skopeo --version | sed -e "s/skopeo version //")" skopeo
 
 DS_CONTAINERS="\
-devspaces/code-rhel8 \
-devspaces/configbump-rhel8 \
-devspaces/devspaces-rhel8-operator \
+devspaces/code-rhel9 \
+devspaces/configbump-rhel9 \
+devspaces/devspaces-rhel9-operator \
 devspaces/devspaces-operator-bundle \
-devspaces/dashboard-rhel8 \
+devspaces/dashboard-rhel9 \
 \
-devspaces/idea-rhel8 \
-devspaces/imagepuller-rhel8 \
-devspaces/machineexec-rhel8 \
-devspaces/pluginregistry-rhel8 \
-devspaces/server-rhel8 \
+devspaces/idea-rhel9 \
+devspaces/imagepuller-rhel9 \
+devspaces/machineexec-rhel9 \
+devspaces/pluginregistry-rhel9 \
+devspaces/server-rhel9 \
 \
-devspaces/traefik-rhel8 \
-devspaces/udi-rhel8 \
+devspaces/traefik-rhel9 \
+devspaces/udi-rhel9 \
 "
 
 # regex pattern of container tags to exclude, eg., latest and -source; also exclude images generated by PR or temporary builds used for publishing assets
@@ -145,9 +145,9 @@ Usage:
   $0 -b ${DWNSTM_BRANCH} --arches                          | use default list of DS images in RHEC Prod; show arches
 
   $0 -c devspaces/iib --quay -o v4.12 --tag ${DS_VERSION}-v4.12          | search for latest Dev Spaces IIBs in quay for a given OCP version
-  $0 -c devspaces/code-rhel8 --quay                            | check latest tag for specific Quay image(s), with branch = ${DWNSTM_BRANCH}
+  $0 -c devspaces/code-rhel9 --quay                            | check latest tag for specific Quay image(s), with branch = ${DWNSTM_BRANCH}
   $0 -c devspaces-operator --osbs                              | check an image from OSBS
-  $0 -c devspaces-devspaces-rhel8-operator --nvr               | check an NVR from OSBS
+  $0 -c devspaces-devspaces-rhel9-operator --nvr               | check an NVR from OSBS
   $0 -c ubi7-minimal -c ubi8-minimal --osbs -n 3 --tag .       | check OSBS registry; show all tags; show 3 tags per container
   $0 -c 'devtools/go-toolset-rhel7 ubi7/go-toolset' --tag 1.1* | check RHEC prod registry; show 1.1* tags (exclude latest and -sources)
   $0 -c pivotaldata/centos --docker --dockerfile               | check docker registry; show Dockerfile contents (requires dfimage)
@@ -242,9 +242,9 @@ if [[ ${REGISTRY} != "" ]]; then
 	REGISTRYPRE="${REGISTRY##*://}/"
 	if [[ ${REGISTRY} == *"registry-proxy.engineering.redhat.com"* ]]; then
 		if [[ ${CONTAINERS} == "" ]] || [[ ${CONTAINERS} == "${DS_CONTAINERS}" ]]; then 
-			CONTAINERS="${DS_CONTAINERS}"; CONTAINERS=${CONTAINERS//devspaces-3-rhel8-/}; CONTAINERS="${CONTAINERS//devspaces\//devspaces-}"
+			CONTAINERS="${DS_CONTAINERS}"; CONTAINERS=${CONTAINERS//devspaces-3-rhel9-/}; CONTAINERS="${CONTAINERS//devspaces\//devspaces-}"
 			CONTAINERS="${CONTAINERS//devspaces-devspaces/devspaces}"
-			CONTAINERS="${CONTAINERS/devspaces-rhel8-operator/devspaces-operator}"
+			CONTAINERS="${CONTAINERS/devspaces-rhel9-operator/devspaces-operator}"
 		fi
 	elif [[ ${REGISTRY} == *"quay.io"* ]]; then
 		searchTag=":${latestNext}"
@@ -294,7 +294,7 @@ if [[ ${SHOWNVR} -eq 1 ]]; then
 	for containername in ${CONTAINERS}; do
 		(( c = c + 1 ))
 		# NEW: devspaces/devspaces-operator-bundle -> devspaces-operator-bundle
-		# NEW: devspaces/devspaces-rhel8-operator  -> devspaces-rhel8-operator
+		# NEW: devspaces/devspaces-rhel9-operator  -> devspaces-rhel9-operator
 		containername="${containername/devspaces-/}"
 		if [[ ${VERBOSE} -eq 1 ]]; then
 			# shellcheck disable=SC2028
@@ -445,7 +445,7 @@ for URLfrag in $CONTAINERS; do
 			QUAYDEST="${REGISTRYPRE}${URLfrag}"; QUAYDEST=${QUAYDEST##*devspaces-} # udi or operator
 			# special case for the operator and bundle images, which don't follow the same pattern in osbs as quay
 			if [[ ${QUAYDEST} == "operator-bundle" ]]; then QUAYDEST="devspaces-operator-bundle"; fi
-			if [[ ${QUAYDEST} == "operator" ]];        then QUAYDEST="devspaces-rhel8-operator"; fi
+			if [[ ${QUAYDEST} == "operator" ]];        then QUAYDEST="devspaces-rhel9-operator"; fi
 			QUAYDEST="quay.io/devspaces/${QUAYDEST}"
 
 			if [[ $(skopeo --insecure-policy inspect docker://${QUAYDEST}:${LATESTTAG} 2>&1) == *"Error"* ]] || [[ ${PUSHTOQUAYFORCE} -eq 1 ]]; then 
diff --git a/product/getTagForImage.sh b/product/getTagForImage.sh
index 9a42dfb5fa..5806d46f87 100755
--- a/product/getTagForImage.sh
+++ b/product/getTagForImage.sh
@@ -7,7 +7,7 @@ usage () {
 Usage: 
   $0 [image1] [image2] [image3] ... [-t show container names, sorted]
 Examples: 
-  $0 quay.io/devspaces/devspaces-rhel8-operator:3.0-1 registry.redhat.io/devspaces/server-rhel8:3.0 devspaces-operator-bundle-container-3.0-2
+  $0 quay.io/devspaces/devspaces-rhel9-operator:3.0-1 registry.redhat.io/devspaces/server-rhel9:3.0 devspaces-operator-bundle-container-3.0-2
   $0 \$(cat LATEST_IMAGES) -s
 "
 	exit
@@ -31,11 +31,11 @@ for d in $images; do
     c="";
     c="${d%:*}" # trim off the tag
     c="${c##*/}" # trim repo and org
-    c="${c##*devspaces-3-rhel8-}" # trim devspaces-3-rhel-9 prefix
-    c="${c/-rhel8/}"  # trim container midfix
+    c="${c##*devspaces-3-rhel9-}" # trim devspaces-3-rhel-9 prefix
+    c="${c/-rhel9/}"  # trim container midfix
     c="${c##*devspaces-}"  # trim container prefix
     c="${c%%-container-*}"  # trim container suffix
-    c="${c%%-rhel8}"  # trim container suffix
+    c="${c%%-rhel9}"  # trim container suffix
   else
     (( c = c + 1 ))
   fi
diff --git a/product/getTagForSHA.sh b/product/getTagForSHA.sh
index e51d5a324c..8e32bd74b8 100755
--- a/product/getTagForSHA.sh
+++ b/product/getTagForSHA.sh
@@ -54,7 +54,7 @@ checkImage () {
     if [[ $URL ]]; then
         container=${URL}
         container=${image}:${container##*/images/}
-        # replace quay.io/devspaces/devspaces-rhel8-operator:3.4:3.4-22 with quay.io/devspaces/devspaces-rhel8-operator:3.4-22
+        # replace quay.io/devspaces/devspaces-rhel9-operator:3.4:3.4-22 with quay.io/devspaces/devspaces-rhel9-operator:3.4-22
         container=$(echo "$container" | sed -r -e "s@:[0-9.]+:@:@")
         if [[ $QUIET -eq 0 ]]; then echo "Got $container"; else echo "$container"; fi
         checkImage_result="true"
diff --git a/product/manifest/get-3rd-party-deps-manifests.sh b/product/manifest/get-3rd-party-deps-manifests.sh
index de33885c8b..6982042e83 100755
--- a/product/manifest/get-3rd-party-deps-manifests.sh
+++ b/product/manifest/get-3rd-party-deps-manifests.sh
@@ -158,9 +158,9 @@ if [[ ${phases} == *"1"* ]]; then
 	devspaces-server \
 	; do
 		if [[ $d == "devspaces" ]]; then
-			containerName=${d##containers/}-server-rhel8-container
+			containerName=${d##containers/}-server-rhel9-container
 		else
-			containerName=${d##containers/}-rhel8-container
+			containerName=${d##containers/}-rhel9-container
 		fi
 		# echo $containerName
 		log ""
diff --git a/product/manifest/get-3rd-party-deps-rpms.sh b/product/manifest/get-3rd-party-deps-rpms.sh
index 3ccc213c8a..f97ecd7b44 100755
--- a/product/manifest/get-3rd-party-deps-rpms.sh
+++ b/product/manifest/get-3rd-party-deps-rpms.sh
@@ -83,7 +83,7 @@ function loadNVRlog() {
 	MANIFEST_FILE2="$2"
 	ARCH="$3"
 	# shellcheck disable=SC2001
-	URL=$(echo $NVR | sed -e "s#\(.\+\(-container\|-rhel8\)\)-\([0-9.]\+\)-\([0-9.]\+\)#https://download.eng.bos.redhat.com/brewroot/packages/\1/\3/\4/data/logs/${ARCH}-build.log#")
+	URL=$(echo $NVR | sed -e "s#\(.\+\(-container\|-rhel9\)\)-\([0-9.]\+\)-\([0-9.]\+\)#https://download.eng.bos.redhat.com/brewroot/packages/\1/\3/\4/data/logs/${ARCH}-build.log#")
 	# log ""
 	log "   ${URL}"
 
diff --git a/product/manifest/get-3rd-party-sources.sh b/product/manifest/get-3rd-party-sources.sh
index 5ed2d7fdaa..4315a2d103 100755
--- a/product/manifest/get-3rd-party-sources.sh
+++ b/product/manifest/get-3rd-party-sources.sh
@@ -145,7 +145,7 @@ if [[ ${phases} == *"1"* ]]; then
         # shellcheck disable=SC2013
         for d in $(sort "${WORKSPACE}"/NVRs.txt); do
             NVR=${d}
-            SOURCES_DIR=${d%-container-*}; SOURCES_DIR=${SOURCES_DIR/-rhel8}; # echo $SOURCES_DIR
+            SOURCES_DIR=${d%-container-*}; SOURCES_DIR=${SOURCES_DIR/-rhel9}; # echo $SOURCES_DIR
             echo "git clone --depth 1 --branch ${MIDSTM_BRANCH} to ${SOURCES_DIR} ..."
             git clone --depth 1 --branch "${MIDSTM_BRANCH}" "ssh://${pduser}@pkgs.devel.redhat.com/containers/${SOURCES_DIR}" "${SOURCES_DIR}" || true
             cd "${SOURCES_DIR}" && git checkout "${MIDSTM_BRANCH}" -q && cd ..
diff --git a/product/rhpkg-container-build.sh b/product/rhpkg-container-build.sh
index 627fee801a..6008b22f5e 100755
--- a/product/rhpkg-container-build.sh
+++ b/product/rhpkg-container-build.sh
@@ -92,8 +92,8 @@ fi
 #      "2.0"
 #  ],
 #  "pull": [
-#      "registry-proxy.engineering.redhat.com/rh-osbs/devspaces-pluginregistry-rhel8@sha256:85c89a1d9e382bebe70f4204f05f06f0fc2b9c76f1c3ca2983c17989b92239fe",
-#      "registry-proxy.engineering.redhat.com/rh-osbs/devspaces-pluginregistry-rhel8:2.0-212"
+#      "registry-proxy.engineering.redhat.com/rh-osbs/devspaces-pluginregistry-rhel9@sha256:85c89a1d9e382bebe70f4204f05f06f0fc2b9c76f1c3ca2983c17989b92239fe",
+#      "registry-proxy.engineering.redhat.com/rh-osbs/devspaces-pluginregistry-rhel9:2.0-212"
 #  ],
 #  "tags": [
 #      "2.0-212"
@@ -123,7 +123,7 @@ if [[ $REPOS ]] && [[ ${VERBOSE} -eq 1 ]]; then echo "[INFO] #2 Console parser s
 # OPTION 2/3
 if [[ ! ${REPOS} ]] || [[ ${REPOS} == " " ]]; then
   # for scratch builds look for this line:
-  # ^ADD Dockerfile-devspaces-server-rhel8-2.0-scratch-89319-20191122035915 /root/buildinfo/Dockerfile-devspaces-server-rhel8-2.0-scratch-89319-20191122035915
+  # ^ADD Dockerfile-devspaces-server-rhel9-2.0-scratch-89319-20191122035915 /root/buildinfo/Dockerfile-devspaces-server-rhel9-2.0-scratch-89319-20191122035915
   echo "REPO_PATH=\"$(grep --text -E "^ADD Dockerfile-devspaces-" "${LOGFILE}" | sed -r -e "s@\[[TZ0123456789.:-]+\]@@" \
     | sed -r -e "s@^ADD Dockerfile-devspaces-(.+) /root/.+@\1@" | sort -u | tr "\n\r" " " )\"" \
     | tee "${WORKSPACE}"/build_desc.txt
@@ -184,7 +184,7 @@ TASK_URL="$(grep --text "Task info: https://brewweb.engineering.redhat.com/brew/
 TASK_ID="${TASK_URL##*=}"
 BUILD_DESC=$(echo $REPO_PATH | sed -r \
     -e 's#registry-proxy.engineering.redhat.com/rh-osbs/devspaces-#quay.io/devspaces/#g' \
-    -e 's#(quay.io/devspaces/.+-rhel8:[0-9.-]+) *#<a href="https://\1">\1</a> #g' \
+    -e 's#(quay.io/devspaces/.+-rhel9:[0-9.-]+) *#<a href="https://\1">\1</a> #g' \
     -e 's#(quay.io/devspaces)/(operator|operator-bundle):([0-9.-]+) *#<a href="https://\1/devspaces-3-rhel-9-\2:\3">\1/devspaces-3-rhel-9-\2:\3</a> #g'
 )
 BUILD_RESULT="SUCCESS"
diff --git a/product/updateBaseImages.sh b/product/updateBaseImages.sh
index 255c020300..6ac2076d8e 100755
--- a/product/updateBaseImages.sh
+++ b/product/updateBaseImages.sh
@@ -202,7 +202,7 @@ for d in $(find "${WORKDIR}/" -maxdepth "${MAXDEPTH}" -name "${DOCKERFILE}" | so
 		echo "# Checking ${d} ..."
 		# pull latest commits
 		if [[ -d ${d%%/${DOCKERFILE}} ]]; then pushd "${d%%/${DOCKERFILE}}" >/dev/null; pushedIn=1; fi
-		if [[ "${d%/${DOCKERFILE}}" == *"-rhel8" ]]; then
+		if [[ "${d%/${DOCKERFILE}}" == *"-rhel9" ]]; then
 			BRANCHUSED=${SOURCES_BRANCH/rhel-7/rhel-8/rhel-9}
 		else
 			BRANCHUSED=${SOURCES_BRANCH}