diff --git a/Dockerfile.ocp b/Dockerfile.ocp
index a6592111f3b..5a0f84dcba5 100644
--- a/Dockerfile.ocp
+++ b/Dockerfile.ocp
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.14 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder
 WORKDIR /go/src/github.com/improbable-eng/thanos
 COPY . .
 ENV GOFLAGS="-mod=vendor"
@@ -11,7 +11,7 @@ RUN if ! yum install -y prometheus-promu; then \
         curl -s -L https://github.com/prometheus/promu/releases/download/v0.5.0/promu-0.5.0.linux-amd64.tar.gz | tar -xzvf - -C /usr/bin  --strip-components 1 promu-0.5.0.linux-amd64/promu; \
     fi; \
     promu build;
-FROM  registry.svc.ci.openshift.org/openshift/origin-v4.0:base
+FROM  registry.svc.ci.openshift.org/ocp/4.6:base
 LABEL io.k8s.display-name="OpenShift Thanos" \
       io.k8s.description="Highly available Prometheus setup with long term storage capabilities." \
       io.openshift.tags="prometheus,monitoring" \