diff --git a/.ci-operator.yaml b/.ci-operator.yaml
index 38718883b..a83f0f843 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.21-openshift-4.16
+  tag: rhel-9-release-golang-1.21-openshift-4.16
diff --git a/go.mod b/go.mod
index 1ccf54dc8..ea59fccb4 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module github.com/operator-framework/operator-controller
 
 go 1.21
 
-toolchain go1.21.0
+toolchain go1.21.7
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
diff --git a/openshift/operator-controller.Dockerfile b/openshift/operator-controller.Dockerfile
index 33ccc52c4..a79cf4822 100644
--- a/openshift/operator-controller.Dockerfile
+++ b/openshift/operator-controller.Dockerfile
@@ -1,9 +1,9 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
 WORKDIR /build
 COPY . .
 RUN make go-build-local
 
-FROM registry.ci.openshift.org/ocp/4.16:base
+FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
 USER 1001
 COPY --from=builder /build/bin/manager /manager
 COPY openshift/manifests /openshift/manifests