diff --git a/UBI/Dockerfile-postgis-multiarch.template b/UBI/Dockerfile-postgis-multiarch.template
index c0736f56..56e60ea4 100644
--- a/UBI/Dockerfile-postgis-multiarch.template
+++ b/UBI/Dockerfile-postgis-multiarch.template
@@ -127,7 +127,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 					exit 1 ;; \
 	esac ; \
 	yum -y install --setopt=install_weak_deps=0 \
-		--enablerepo=ubi-%%UBI_MAJOR_VERSION%%-codeready-builder,codeready-builder-for-rhel-%%UBI_MAJOR_VERSION%%-${BUILDARCH}-rpms \
+		--enablerepo=codeready-builder-for-rhel-%%UBI_MAJOR_VERSION%%-${BUILDARCH}-rpms \
 		postgis%%POSTGIS_MAJOR%%_%%PG_MAJOR%%-%%POSTGIS_VERSION%% \
 		"$pgrouting_pkg" \
 	; \
diff --git a/UBI/Dockerfile-postgis-multilang.template b/UBI/Dockerfile-postgis-multilang.template
index e044860c..fe769e71 100644
--- a/UBI/Dockerfile-postgis-multilang.template
+++ b/UBI/Dockerfile-postgis-multilang.template
@@ -93,7 +93,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 					exit 1 ;; \
 	esac ; \
 	yum -y install --setopt=install_weak_deps=0 \
-		--enablerepo=ubi-%%UBI_MAJOR_VERSION%%-codeready-builder,codeready-builder-for-rhel-%%UBI_MAJOR_VERSION%%-${BUILDARCH}-rpms \
+		--enablerepo=codeready-builder-for-rhel-%%UBI_MAJOR_VERSION%%-${BUILDARCH}-rpms \
 		postgis%%POSTGIS_MAJOR%%_%%PG_MAJOR%%-%%POSTGIS_VERSION%% \
 		pgrouting_%%PG_MAJOR%% \
 	; \
diff --git a/UBI/Dockerfile-postgis.template b/UBI/Dockerfile-postgis.template
index 110f5e0b..983882fc 100644
--- a/UBI/Dockerfile-postgis.template
+++ b/UBI/Dockerfile-postgis.template
@@ -92,7 +92,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 					exit 1 ;; \
 	esac ; \
 	yum -y install --setopt=install_weak_deps=0 \
-		--enablerepo=ubi-%%UBI_MAJOR_VERSION%%-codeready-builder,codeready-builder-for-rhel-%%UBI_MAJOR_VERSION%%-${BUILDARCH}-rpms \
+		--enablerepo=codeready-builder-for-rhel-%%UBI_MAJOR_VERSION%%-${BUILDARCH}-rpms \
 		postgis%%POSTGIS_MAJOR%%_%%PG_MAJOR%%-%%POSTGIS_VERSION%% \
 		pgrouting_%%PG_MAJOR%% \
 	; \
diff --git a/UBI/update.sh b/UBI/update.sh
index 1d27d685..f0f46d6d 100755
--- a/UBI/update.sh
+++ b/UBI/update.sh
@@ -222,20 +222,28 @@ generate_redhat() {
 		exit 1
 	fi
 
+	if [ -f "${versionFile}" ]; then
+		oldUbiVersion=$(jq -r '.UBI_VERSION' "${versionFile}")
+		oldPostgresqlVersion=$(jq -r '.POSTGRES_VERSION' "${versionFile}")
+		oldBarmanVersion=$(jq -r '.BARMAN_VERSION' "${versionFile}")
+		oldImageReleaseVersion=$(jq -r '.IMAGE_RELEASE_VERSION' "${versionFile}")
+		imageReleaseVersion=$oldImageReleaseVersion
+	fi
+
 	pg_x86_64=$(get_postgresql_version "${ubiRelease}" 'x86_64' "$version")
 	pg_ppc64le=$(get_postgresql_version "${ubiRelease}" 'ppc64le' "$version")
 	pg_s390x=$(get_postgresql_version "${ubiRelease}" 's390x' "$version")
 	pg_arm64=$(get_postgresql_version "${ubiRelease}" 'aarch64' "$version")
+	postgresqlVersion="${pg_x86_64}"
 	if ! compare_architecture_pkgs "$pg_x86_64" "$pg_arm64" "$pg_ppc64le" "$pg_s390x"; then
 		echo "Version discrepancy between the architectures of PostgreSQL $version packages in UBI$ubiRelease." >&2
 		echo "x86_64: $pg_x86_64" >&2
 		echo "arm64: $pg_arm64" >&2
 		echo "ppc64le: $pg_ppc64le" >&2
 		echo "s390x: $pg_s390x" >&2
-		return
+		postgresqlVersion="${oldPostgresqlVersion}"
 	fi
 
-	postgresqlVersion="${pg_x86_64}"
 	if [ -z "$postgresqlVersion" ]; then
 		echo "Unable to retrieve latest PostgreSQL $version version for UBI$ubiRelease"
 		return
@@ -262,13 +270,7 @@ generate_redhat() {
 	# Output the full Postgresql package name
 	echo "$version: ${postgresqlVersion} (UBI${ubiRelease})"
 
-	if [ -f "${versionFile}" ]; then
-		oldUbiVersion=$(jq -r '.UBI_VERSION' "${versionFile}")
-		oldPostgresqlVersion=$(jq -r '.POSTGRES_VERSION' "${versionFile}")
-		oldBarmanVersion=$(jq -r '.BARMAN_VERSION' "${versionFile}")
-		oldImageReleaseVersion=$(jq -r '.IMAGE_RELEASE_VERSION' "${versionFile}")
-		imageReleaseVersion=$oldImageReleaseVersion
-	else
+	if [ ! -f "${versionFile}" ]; then
 		imageReleaseVersion=1
 
 		echo "{}" > "${versionFile}"
@@ -384,20 +386,29 @@ generate_redhat_postgis() {
 		exit 1
 	fi
 
+	if [ -f "${versionFile}" ]; then
+		oldUbiVersion=$(jq -r '.UBI_VERSION' "${versionFile}")
+		oldPostgresqlVersion=$(jq -r '.POSTGRES_VERSION' "${versionFile}")
+		oldPostgisVersion=$(jq -r '.POSTGIS_VERSION' "${versionFile}")
+		oldBarmanVersion=$(jq -r '.BARMAN_VERSION' "${versionFile}")
+		oldImageReleaseVersion=$(jq -r '.IMAGE_RELEASE_VERSION' "${versionFile}")
+		imageReleaseVersion=$oldImageReleaseVersion
+	fi
+
 	pg_x86_64=$(get_postgresql_version "${ubiRelease}" 'x86_64' "$version")
 	pg_ppc64le=$(get_postgresql_version "${ubiRelease}" 'ppc64le' "$version")
 	pg_s390x=$(get_postgresql_version "${ubiRelease}" 's390x' "$version")
 	pg_arm64=$(get_postgresql_version "${ubiRelease}" 'aarch64' "$version")
+	postgresqlVersion="${pg_x86_64}"
 	if ! compare_architecture_pkgs "$pg_x86_64" "$pg_arm64" "$pg_ppc64le" "$pg_s390x"; then
 		echo "Version discrepancy between the architectures of PostgreSQL $version packages in UBI$ubiRelease." >&2
 		echo "x86_64: $pg_x86_64" >&2
 		echo "arm64: $pg_arm64" >&2
 		echo "ppc64le: $pg_ppc64le" >&2
 		echo "s390x: $pg_s390x" >&2
-		return
+		postgresqlVersion="${oldPostgresqlVersion}"
 	fi
 
-	postgresqlVersion="${pg_x86_64}"
 	if [ -z "$postgresqlVersion" ]; then
 		echo "Unable to retrieve latest PostgreSQL $version version for UBI$ubiRelease"
 		return
@@ -419,16 +430,16 @@ generate_redhat_postgis() {
 	postgis_ppc64le=$(get_postgis_version "${ubiRelease}" 'ppc64le' "$version")
 	postgis_s390x=$(get_postgis_version "${ubiRelease}" 's390x' "$version")
 	postgis_arm64=$(get_postgis_version "${ubiRelease}" 'aarch64' "$version")
+	postgisVersion="${postgis_x86_64}"
 	if ! compare_architecture_pkgs "$postgis_x86_64" "$postgis_arm64" "$postgis_ppc64le" "$postgis_s390x"; then
 		echo "Version discrepancy between the architectures of PostGIS $version packages in UBI$ubiRelease." >&2
 		echo "x86_64: $postgis_x86_64" >&2
 		echo "arm64: $postgis_arm64" >&2
 		echo "ppc64le: $postgis_ppc64le" >&2
 		echo "s390x: $postgis_s390x" >&2
-		return
+		postgisVersion="${oldPostgisVersion}"
 	fi
 
-	postgisVersion="${postgis_x86_64}"
 	if [ -z "$postgisVersion" ]; then
 		echo "Unable to get the PostGIS version"
 		exit 1
@@ -446,14 +457,7 @@ generate_redhat_postgis() {
 	# Output the full Postgresql and PostGIS package name
 	echo "$version: ${postgresqlVersion} - PostGIS ${postgisVersion} (UBI${ubiRelease})"
 
-	if [ -f "${versionFile}" ]; then
-		oldUbiVersion=$(jq -r '.UBI_VERSION' "${versionFile}")
-		oldPostgresqlVersion=$(jq -r '.POSTGRES_VERSION' "${versionFile}")
-		oldPostgisVersion=$(jq -r '.POSTGIS_VERSION' "${versionFile}")
-		oldBarmanVersion=$(jq -r '.BARMAN_VERSION' "${versionFile}")
-		oldImageReleaseVersion=$(jq -r '.IMAGE_RELEASE_VERSION' "${versionFile}")
-		imageReleaseVersion=$oldImageReleaseVersion
-	else
+	if [ ! -f "${versionFile}" ]; then
 		imageReleaseVersion=1
 
 		echo "{}" > "${versionFile}"