diff --git a/images/recycler/Dockerfile.rhel b/images/recycler/Dockerfile.rhel
index ec566eb46d..dc64543501 100644
--- a/images/recycler/Dockerfile.rhel
+++ b/images/recycler/Dockerfile.rhel
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/4.11:cli
+FROM registry.ci.openshift.org/ocp/4.16:cli
 
 LABEL io.k8s.display-name="OpenShift Volume Recycler" \
       io.k8s.description="This is a component of OpenShift and is used to prepare persistent volumes for reuse after they are deleted." \
diff --git a/images/tools/Dockerfile b/images/tools/Dockerfile
index 8443c2ad12..7c2bd68bea 100644
--- a/images/tools/Dockerfile
+++ b/images/tools/Dockerfile
@@ -1,4 +1,11 @@
-FROM registry.ci.openshift.org/ocp/4.16:cli
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
+WORKDIR /go/src/github.com/openshift/oc
+COPY . .
+RUN make build --warn-undefined-variables
+
+FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
+COPY --from=builder /go/src/github.com/openshift/oc/oc /usr/bin/
+RUN for i in kubectl openshift-deploy openshift-docker-build openshift-sti-build openshift-git-clone openshift-manage-dockerfile openshift-extract-image-content openshift-recycle; do ln -sf /usr/bin/oc /usr/bin/$i; done
 RUN INSTALL_PKGS="\
   bash-completion \
   bc \
@@ -8,6 +15,7 @@ RUN INSTALL_PKGS="\
   e2fsprogs \
   ethtool \
   file \
+  fio \
   git \
   glibc-utils \
   gzip \
@@ -18,7 +26,6 @@ RUN INSTALL_PKGS="\
   jq \
   less \
   ltrace \
-  mailx \
   net-tools \
   nmap-ncat \
   parted \
@@ -26,8 +33,11 @@ RUN INSTALL_PKGS="\
   procps-ng \
   psmisc \
   perf \
+  python3 \
   sos \
+  s-nail \
   strace \
+  stress-ng \
   sysstat \
   tcpdump \
   tmux \
@@ -35,9 +45,6 @@ RUN INSTALL_PKGS="\
   vim-enhanced \
   wget \
   xfsprogs \
-  fio \
-  stress-ng \
-  python36 \
   " && \
   yum -y install $INSTALL_PKGS && rpm -V --nosize --nofiledigest --nomtime --nomode $INSTALL_PKGS && yum clean all && rm -rf /var/cache/*
   # Disabled until they are buildable on s390x
@@ -47,4 +54,5 @@ RUN INSTALL_PKGS="\
 CMD ["/usr/bin/bash"]
 LABEL io.k8s.display-name="OpenShift Tools" \
       io.k8s.description="Contains debugging and diagnostic tools for use with an OpenShift cluster." \
+      io.openshift.build.versions="kubectl=1.29.1" \
       io.openshift.tags="openshift,tools"