diff --git a/2/Dockerfile.rhel8 b/2/Dockerfile.rhel8
index b5bc72880..779807fd8 100644
--- a/2/Dockerfile.rhel8
+++ b/2/Dockerfile.rhel8
@@ -1,7 +1,7 @@
 ##############################################
 # Stage 1 : Build go-init
 ##############################################
-FROM openshift/origin-release:golang-1.12 AS go-init-builder
+FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS go-init-builder
 WORKDIR  /go/src/github.com/openshift/jenkins
 COPY . .
 WORKDIR  /go/src/github.com/openshift/jenkins/go-init
@@ -10,7 +10,7 @@ RUN go build . && cp go-init /usr/bin
 ##############################################
 # Stage 2 : Build slave-base with go-init
 ##############################################
-FROM quay.io/openshift/origin-cli
+FROM registry.svc.ci.openshift.org/ocp/4.6:cli
 MAINTAINER OpenShift Developer Services <openshift-dev-services+jenkins@redhat.com>
 COPY --from=go-init-builder /usr/bin/go-init /usr/bin/go-init