diff --git a/Makefile b/Makefile
index dac1d59d15..4cab31c68a 100644
--- a/Makefile
+++ b/Makefile
@@ -112,7 +112,7 @@ GO_TEST_PACKAGES=./cmd/... ./pkg/...
 export CGO_ENABLED ?= 1
 
 # Specify OCP build tools image tag when building rpm with podman
-RPM_BUILDER_IMAGE_TAG := rhel-9-golang-latest-openshift-4.15
+RPM_BUILDER_IMAGE_TAG := rhel-9-golang-1.20-builder-multi-openshift-4.16 
 
 all: generate-config microshift etcd
 
diff --git a/packaging/images/Containerfile.rpm-builder b/packaging/images/Containerfile.rpm-builder
index f47cc46ce3..a92400a979 100644
--- a/packaging/images/Containerfile.rpm-builder
+++ b/packaging/images/Containerfile.rpm-builder
@@ -1,5 +1,5 @@
 ARG TAG
-FROM registry.ci.openshift.org/ocp-multi/builder:$TAG
+FROM registry.ci.openshift.org/ocp/builder:$TAG
 
 RUN rm -rfv /etc/yum.repos.d/ci-rpm-mirrors.repo /etc/yum.repos.d/localdev* && \
     dnf install \