diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7
index 8b37049f0..7c7f19216 100644
--- a/Dockerfile.openshift.rhel7
+++ b/Dockerfile.openshift.rhel7
@@ -1,9 +1,9 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder
 WORKDIR /go/src/k8s.io/node-problem-detector
 COPY . .
 RUN yum install -y systemd-devel && \
     make build-binaries
 
-FROM registry.svc.ci.openshift.org/ocp/4.0:base
+FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.6
 COPY --from=builder /go/src/k8s.io/node-problem-detector/bin/node-problem-detector /usr/bin/
 COPY --from=builder /go/src/k8s.io/node-problem-detector/bin/log-counter /usr/bin/