diff --git a/images/build-e2e/Containerfile b/images/build-e2e/Containerfile
index 9dbe2dd453..379cd8feb2 100644
--- a/images/build-e2e/Containerfile
+++ b/images/build-e2e/Containerfile
@@ -1,5 +1,5 @@
 
-FROM registry.access.redhat.com/ubi8/go-toolset:1.21 AS builder
+FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.17 AS builder
 
 USER root
 
diff --git a/images/build-integration/Containerfile b/images/build-integration/Containerfile
index e2429f17f8..6720c8a4ab 100644
--- a/images/build-integration/Containerfile
+++ b/images/build-integration/Containerfile
@@ -1,5 +1,5 @@
 
-FROM registry.access.redhat.com/ubi8/go-toolset:1.21 AS builder
+FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.17 AS builder
 
 USER root
 
diff --git a/images/build/Dockerfile b/images/build/Dockerfile
index 12b47ba557..04d3d1f130 100644
--- a/images/build/Dockerfile
+++ b/images/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/go-toolset:1.21
+FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.17
 MAINTAINER CRC <devtools-cdk@redhat.com>
 
 WORKDIR $APP_ROOT/src