diff --git a/images/build-e2e/Dockerfile b/images/build-e2e/Dockerfile
index 1bb73dfa95..7221515a3d 100644
--- a/images/build-e2e/Dockerfile
+++ b/images/build-e2e/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/go-toolset:1.20 as builder
+FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.20-openshift-4.15 AS builder
 
 USER root
 WORKDIR /workspace
diff --git a/images/build-integration/Dockerfile b/images/build-integration/Dockerfile
index 0fed2a2620..4fca67c56e 100644
--- a/images/build-integration/Dockerfile
+++ b/images/build-integration/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/go-toolset:1.20 as builder
+FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.20-openshift-4.15 AS builder
 
 USER root
 WORKDIR /workspace
diff --git a/images/build/Dockerfile b/images/build/Dockerfile
index 267e69d34e..190879312b 100644
--- a/images/build/Dockerfile
+++ b/images/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/go-toolset:1.14.12
+FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.20-openshift-4.15
 MAINTAINER CRC <devtools-cdk@redhat.com>
 
 WORKDIR $APP_ROOT/src
diff --git a/images/openshift-ci/Dockerfile b/images/openshift-ci/Dockerfile
index 3dbcf02661..8abd179d7a 100644
--- a/images/openshift-ci/Dockerfile
+++ b/images/openshift-ci/Dockerfile
@@ -1,7 +1,7 @@
 # This Dockerfile is used by openshift CI
 # It builds an image containing crc and nss-wrapper for remote deployments, as well as the google cloud-sdk for nested GCE environments.
 
-FROM registry.ci.openshift.org/openshift/release:golang-1.20 AS builder
+FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.20-openshift-4.15 AS builder
 WORKDIR /go/src/github.com/crc-org/crc
 COPY . .
 RUN make release
diff --git a/update-go-version.sh b/update-go-version.sh
index 9fac0c57e5..764cbfc460 100755
--- a/update-go-version.sh
+++ b/update-go-version.sh
@@ -11,9 +11,7 @@ echo "Updating golang version to $golang_base_version"
 
 go mod edit -go ${golang_base_version}
 go mod edit -go ${golang_base_version} tools/go.mod
-sed -i "s,^FROM registry.ci.openshift.org/openshift/release:golang-1\... AS builder\$,FROM registry.ci.openshift.org/openshift/release:golang-${golang_base_version} AS builder," images/openshift-ci/Dockerfile
-sed -i "s,^FROM registry.access.redhat.com/ubi8/go-toolset:[.0-9]\+ as builder\$,FROM registry.access.redhat.com/ubi8/go-toolset:${golang_base_version} as builder," images/build-e2e/Dockerfile
-sed -i "s,^FROM registry.access.redhat.com/ubi8/go-toolset:[.0-9]\+ as builder\$,FROM registry.access.redhat.com/ubi8/go-toolset:${golang_base_version} as builder," images/build-integration/Dockerfile
+sed -i "s,^\(FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-\)1.[0-9]\+,\1${golang_base_version}," images/*/Dockerfile
 for f in .github/workflows/*.yml; do
     yq eval --inplace ".jobs.build.strategy.matrix.go[0] = ${golang_base_version}" "$f";
 done