diff --git a/Dockerfile.openstack-cinder b/Dockerfile.openstack-cinder
index c923554b0..5ae7aae0d 100644
--- a/Dockerfile.openstack-cinder
+++ b/Dockerfile.openstack-cinder
@@ -1,9 +1,9 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder
 WORKDIR /go/src/github.com/openshift/csi-operator
 COPY . .
 RUN make GO_BUILD_PACKAGES=./cmd/openstack-cinder-csi-driver-operator
 
-FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
 COPY --from=builder /go/src/github.com/openshift/csi-operator/bin/openstack-cinder-csi-driver-operator /usr/bin/
 ENTRYPOINT ["/usr/bin/openstack-cinder-csi-driver-operator"]
 LABEL io.k8s.display-name="OpenShift OpenStack Cinder CSI Driver Operator" \