diff --git a/images/ose-etcd.yml b/images/ose-etcd.yml
index 16bde488c0..993d697bb0 100644
--- a/images/ose-etcd.yml
+++ b/images/ose-etcd.yml
@@ -27,7 +27,7 @@ content:
     ci_alignment:
       streams_prs:
         ci_build_root:
-          stream: rhel-9-golang-1.21-ci-build-root
+          stream: rhel-9-golang-ci-build-root
     okd_alignment:
       dockerfile: Dockerfile.rhel
 distgit:
@@ -42,7 +42,7 @@ enabled_repos:
 for_payload: true
 from:
   builder:
-  - stream: rhel-9-golang-1.21
+  - stream: rhel-9-golang
   member: openshift-enterprise-base-rhel9
 labels:
   License: Apache 2.0
diff --git a/images/ose-installer-etcd-artifacts.yml b/images/ose-installer-etcd-artifacts.yml
index d798e019d0..be56b9d1e7 100644
--- a/images/ose-installer-etcd-artifacts.yml
+++ b/images/ose-installer-etcd-artifacts.yml
@@ -29,7 +29,7 @@ content:
       streams_prs:
         enabled: false
         ci_build_root:
-          stream: rhel-9-golang-1.21-ci-build-root
+          stream: rhel-9-golang-ci-build-root
     okd_alignment:
       dockerfile: Dockerfile.installer
 distgit:
@@ -44,11 +44,11 @@ from:
   builder:
   # IMPORTANT: etcd has unique approval to track its own etcd version. Other repos need arch
   # approval to diverge from what kube apiserver uses for a given release.
-  - stream: rhel-9-golang-1.21
-  - stream: rhel-9-golang-1.21
-  - stream: rhel-9-golang-1.21
-  - stream: rhel-9-golang-1.21
-  - stream: rhel-9-golang-1.21
+  - stream: rhel-9-golang
+  - stream: rhel-9-golang
+  - stream: rhel-9-golang
+  - stream: rhel-9-golang
+  - stream: rhel-9-golang
   member: openshift-enterprise-base-rhel9
 labels:
   License: GPLv2+
diff --git a/streams.yml b/streams.yml
index 738fbbc06c..3ac78ce765 100644
--- a/streams.yml
+++ b/streams.yml
@@ -133,30 +133,6 @@ rhel-9-golang-1.21-ci-build-root:
   transform: rhel-9/ci-build-root
   upstream_image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.21-openshift-{MAJOR}.{MINOR}
 
-# IMPORTANT: etcd has unique approval to track its own etcd version. Other repos need arch
-# approval to diverge from what kube apiserver uses for a given release.
-etcd_golang:
-  image: openshift/golang-builder:v1.19.13-202408070335.gfa00de2.el8
-  mirror: true
-  # No transform required as etcd does not yum install any packages.
-  # Leave this upstream information in place even if mirror/transform is disabled. Test Platform read the data.
-  upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-8-etcd-golang-1.19
-  upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-etcd-golang-1.19
-  # To ensure consistency in our builds and allow CI to use the same build, mirror the upstream builder image from ocp/builder to ocp-private/builder-priv.
-  upstream_image_mirror:
-  - registry.ci.openshift.org/ocp-private/builder-priv:rhel-8-etcd-golang-1.19
-
-etcd_rhel9_golang:
-  image: openshift/golang-builder:v1.19.13-202408070451.g3172d57.el9
-  mirror: true
-  # No transform required as etcd does not yum install
-  # Leave this upstream information in place even if mirror/transform is disabled. Test Platform read the data.
-  upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-9-etcd-golang-1.19
-  upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-etcd-golang-1.19
-  # To ensure consistency in our builds and allow CI to use the same build, mirror the upstream builder image from ocp/builder to ocp-private/builder-priv.
-  upstream_image_mirror:
-  - registry.ci.openshift.org/ocp-private/builder-priv:rhel-9-etcd-golang-1.19
-
 rhel8:
   # the most recent release at present. since we yum update this, it does not need to float.
   # it is important that we not build from unreleased builds and publish them.