diff --git a/images/openshift-enterprise-tests.yml b/images/openshift-enterprise-tests.yml
index 90669c43ba..45c70ea425 100644
--- a/images/openshift-enterprise-tests.yml
+++ b/images/openshift-enterprise-tests.yml
@@ -9,28 +9,23 @@ content:
     ci_alignment:
       streams_prs:
         ci_build_root:
-          stream: rhel-8-golang-ci-build-root
+          stream: rhel-9-golang-1.21-ci-build-root
 distgit:
-  branch: rhaos-{MAJOR}.{MINOR}-rhel-8
+  branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: openshift-enterprise-tests-container
   namespace: containers
 enabled_repos:
-- openstack-16-for-rhel-8-rpms
-- rhel-8-appstream-rpms
-- rhel-8-baseos-rpms
-- rhel-8-rt-rpms
-# Generally doozer scan-sources will detect all possible change factors automatically and trigger rebuilds.
-# However, certain images may consume RPMs in unexpected way that make it programmatically impossible to
-# detect they were used.
+- rhel-9-appstream-rpms
+- rhel-9-baseos-rpms
+- rhel-9-rt-rpms
+- openstack-17-for-rhel-9-rpms
 scan_sources:
-  # The openstack-16-for-rhel-8-rpms repo provides some python3-* packages newer than those from rhel-8-baseos-rpms.
-  # For some reason this image doesn't consume those newer versions.
   exempt_rpms:
   - python3-dateutil
 for_payload: true
 from:
   builder:
-  - stream: golang
+  - stream: rhel-9-golang
   member: ose-tools
 labels:
   License: GPLv2+
@@ -39,9 +34,9 @@ labels:
   io.k8s.display-name: OpenShift End-to-End Tests
   io.openshift.tags: openshift,tests,e2e
   vendor: Red Hat
-name: openshift/ose-tests
+name: openshift/ose-tests-rhel9
 payload_name: tests
 owners:
 - aos-master@redhat.com
 - openshift-technical-release-staff@redhat.com
-canonical_builders_from_upstream: False # member image does not get resolved well
+canonical_builders_from_upstream: false # member image does not get resolved well
diff --git a/images/ose-network-tools.yml b/images/ose-network-tools.yml
index 99e5815b38..135c5c1416 100644
--- a/images/ose-network-tools.yml
+++ b/images/ose-network-tools.yml
@@ -9,21 +9,20 @@ content:
     ci_alignment:
       streams_prs:
         ci_build_root:
-          stream: rhel-8-golang-1.20-ci-build-root
+          stream: rhel-9-golang-1.21-ci-build-root
 distgit:
-  branch: rhaos-{MAJOR}.{MINOR}-rhel-8
+  branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: ose-network-tools-container
 enabled_repos:
-- rhel-8-baseos-rpms
-- rhel-8-appstream-rpms
+- rhel-9-baseos-rpms
+- rhel-9-appstream-rpms
 for_payload: true
 from:
   builder:
-  - stream: golang-1.20
+  - stream: rhel-9-golang
   - member: ose-ovn-kubernetes
   member: ose-tools
-name: openshift/ose-network-tools
+name: openshift/ose-network-tools-rhel9
 payload_name: network-tools
 owners:
 - aos-networking-staff@redhat.com
-canonical_builders_from_upstream: False # member image does not get resolved well
diff --git a/images/ose-tools.yml b/images/ose-tools.yml
index 234e55e1be..69de33e1bb 100644
--- a/images/ose-tools.yml
+++ b/images/ose-tools.yml
@@ -9,17 +9,19 @@ content:
     ci_alignment:
       streams_prs:
         ci_build_root:
-          stream: rhel-8-golang-1.20-ci-build-root
+          stream: rhel-9-golang-1.21-ci-build-root
 distgit:
-  branch: rhaos-{MAJOR}.{MINOR}-rhel-8
+  branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: ose-tools-container
   namespace: containers
 enabled_repos:
-- rhel-8-appstream-rpms
-- rhel-8-baseos-rpms
+- rhel-9-appstream-rpms
+- rhel-9-baseos-rpms
 for_payload: true
 from:
-  member: openshift-enterprise-cli
+  builder:
+  - stream: rhel-9-golang
+  member: openshift-enterprise-base-rhel9
 labels:
   License: GPLv2+
   io.k8s.description: Contains debugging and diagnostic tools for use with an OpenShift
@@ -27,9 +29,9 @@ labels:
   io.k8s.display-name: OpenShift Tools
   io.openshift.tags: openshift,tools
   vendor: Red Hat
-name: openshift/ose-tools
+name: openshift/ose-tools-rhel9
 payload_name: tools
 owners:
 - ccoleman@redhat.com
 - aos-master@redhat.com
-canonical_builders_from_upstream: False # member image does not get resolved well
+canonical_builders_from_upstream: false # member image does not get resolved well