diff --git a/.ci-operator.yaml b/.ci-operator.yaml
index a83f0f8430..64887a08b4 100644
--- a/.ci-operator.yaml
+++ b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.21-openshift-4.16
+  tag: rhel-9-release-golang-1.22-openshift-4.18
diff --git a/Dockerfile.rhel8 b/Dockerfile.rhel8
index 418281190e..11f7bcd765 100644
--- a/Dockerfile.rhel8
+++ b/Dockerfile.rhel8
@@ -1,9 +1,9 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
 WORKDIR /go/src/github.com/openshift/builder
 COPY . .
 RUN hack/build.sh
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.16
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.18
 RUN INSTALL_PKGS=" \
       bind-utils bsdtar findutils fuse-overlayfs git git-lfs hostname lsof \
       netavark procps-ng runc socat tar tree util-linux wget which \