diff --git a/ci-operator/config/openshift/ocm-agent/openshift-ocm-agent-master.yaml b/ci-operator/config/openshift/ocm-agent/openshift-ocm-agent-master.yaml
index 4e70d8cbc750a..fba6a9f585f71 100644
--- a/ci-operator/config/openshift/ocm-agent/openshift-ocm-agent-master.yaml
+++ b/ci-operator/config/openshift/ocm-agent/openshift-ocm-agent-master.yaml
@@ -3,10 +3,10 @@ base_images:
     name: ubi
     namespace: ocp
     tag: "8"
-  openshift_release_rhel-8-release-golang-1.22-openshift-4.18:
+  openshift_release_rhel-9-release-golang-1.23-openshift-4.19:
     name: release
     namespace: openshift
-    tag: rhel-8-release-golang-1.22-openshift-4.18
+    tag: rhel-9-release-golang-1.23-openshift-4.19
 build_root:
   image_stream_tag:
     name: release
@@ -16,9 +16,9 @@ images:
 - dockerfile_path: build/Dockerfile
   from: base
   inputs:
-    openshift_release_rhel-8-release-golang-1.22-openshift-4.18:
+    openshift_release_rhel-9-release-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
   to: ocm-agent
 resources:
   '*':
diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.15.58-x86-64-for-4.15.0-0-to-4.16.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.15.58-x86-64-for-4.15.0-0-to-4.16.0-0_clusterimageset.yaml
index 36a4a0b997a68..065783ca61e94 100644
--- a/clusters/hosted-mgmt/hive/pools/ocp-release-4.15.58-x86-64-for-4.15.0-0-to-4.16.0-0_clusterimageset.yaml
+++ b/clusters/hosted-mgmt/hive/pools/ocp-release-4.15.58-x86-64-for-4.15.0-0-to-4.16.0-0_clusterimageset.yaml
@@ -3,6 +3,7 @@ kind: ClusterImageSet
 metadata:
   annotations:
     version_lower: 4.15.0-0
+    version_stream: 4-stable
     version_upper: 4.16.0-0
   creationTimestamp: null
   name: ocp-release-4.15.58-x86-64-for-4.15.0-0-to-4.16.0-0
diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.40-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.40-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml
index 3eeeb87e1d610..9a2bfa8b1c8af 100644
--- a/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.40-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml
+++ b/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.40-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml
@@ -3,6 +3,7 @@ kind: ClusterImageSet
 metadata:
   annotations:
     version_lower: 4.17.0-0
+    version_stream: 4-stable
     version_upper: 4.18.0-0
   creationTimestamp: null
   name: ocp-release-4.17.40-x86-64-for-4.17.0-0-to-4.18.0-0