diff --git a/.ci-operator.yaml b/.ci-operator.yaml
index 7cd14bfef5..38718883ba 100644
--- a/.ci-operator.yaml
+++ b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.20-openshift-4.15
+  tag: rhel-8-release-golang-1.21-openshift-4.16
diff --git a/Dockerfile.ocp b/Dockerfile.ocp
index 24accdd028..d045a3e36f 100644
--- a/Dockerfile.ocp
+++ b/Dockerfile.ocp
@@ -1,10 +1,10 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
 
 WORKDIR /go/src/github.com/prometheus/node_exporter
 COPY . .
 RUN if yum install -y prometheus-promu; then export BUILD_PROMU=false; fi && make build
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.15
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.16
 LABEL io.k8s.display-name="OpenShift Prometheus Node Exporter" \
       io.k8s.description="Prometheus exporter for machine metrics" \
       io.openshift.tags="prometheus,monitoring" \