diff --git a/rpm/cray/csm/noos/index.yaml b/rpm/cray/csm/noos/index.yaml
index c359a01a9..6ce33e27f 100644
--- a/rpm/cray/csm/noos/index.yaml
+++ b/rpm/cray/csm/noos/index.yaml
@@ -28,9 +28,6 @@ https://artifactory.algol60.net/artifactory/csm-rpms/hpe/stable/noos/:
     - bos-reporter-2.6.0-1.noarch
     - cani-0.1.0-1.x86_64
     - canu-1.7.5-1.x86_64
-    - cray-kubectl-hns-plugin-1.0.2-1.x86_64
-    - cray-kubectl-kubelogin-plugin-1.25.3-1.x86_64
-    - cray-prodmgr-1.1.6-1.x86_64
     - cray-site-init-1.32.0-1.x86_64
     - cray-uai-util-2.2.1-1.noarch
     - craycli-0.82.9-1.aarch64
@@ -40,9 +37,6 @@ https://artifactory.algol60.net/artifactory/csm-rpms/hpe/stable/noos/:
     - csm-node-heartbeat-2.1-3.x86_64
     - csm-node-identity-1.0.22-1.noarch
     - csm-testing-1.16.51-1.noarch
-    - dracut-metal-dmk8s-2.1.1-1.noarch
-    - dracut-metal-luksetcd-2.1.1-1.noarch
-    - dracut-metal-mdsquash-2.4.3-1.noarch
     - goss-servers-1.16.51-1.noarch
     - hpe-csm-goss-package-0.3.21-hpe3.x86_64
     - hpe-csm-scripts-0.5.7-1.noarch
diff --git a/rpm/cray/csm/sle-15sp3/index.yaml b/rpm/cray/csm/sle-15sp3/index.yaml
index 1dae84369..c22522a90 100644
--- a/rpm/cray/csm/sle-15sp3/index.yaml
+++ b/rpm/cray/csm/sle-15sp3/index.yaml
@@ -26,6 +26,7 @@ https://artifactory.algol60.net/artifactory/csm-rpms/hpe/stable/sle-15sp3/:
     - cfs-debugger-1.4.0-1.noarch
     - cfs-state-reporter-1.9.3-1.noarch
     - cfs-trust-1.6.7-1.noarch
+    - cray-site-init-1.32.0-1.x86_64
     - hpe-yq-4.33.3-1.aarch64
     - hpe-yq-4.33.3-1.x86_64
     - libcsm-0.0.4-1.noarch
@@ -35,6 +36,5 @@ https://artifactory.algol60.net/artifactory/csm-rpms/hpe/stable/sle-15sp3/:
 # expect them to be found here
 https://artifactory.algol60.net/artifactory/csm-rpms/hpe/stable/noos/:
   rpms:
-    - cray-site-init-1.32.0-1.x86_64
     - craycli-0.82.9-1.aarch64
     - craycli-0.82.9-1.x86_64
diff --git a/rpm/cray/csm/sle-15sp4/index.yaml b/rpm/cray/csm/sle-15sp4/index.yaml
index 28d2ed10f..38d804e07 100644
--- a/rpm/cray/csm/sle-15sp4/index.yaml
+++ b/rpm/cray/csm/sle-15sp4/index.yaml
@@ -28,13 +28,17 @@ https://artifactory.algol60.net/artifactory/csm-rpms/hpe/stable/sle-15sp4/:
     - cfs-state-reporter-1.9.3-1.noarch
     - cfs-trust-1.6.7-1.noarch
     - cray-cmstools-crayctldeploy-1.12.0-1.x86_64
+    - cray-site-init-1.32.0-1.x86_64
     - csm-ssh-keys-1.5.4-1.noarch
     - csm-ssh-keys-roles-1.5.4-1.noarch
+    - hpe-csm-goss-package-0.3.21-hpe3.x86_64
     - hpe-yq-4.33.3-1.aarch64
     - hpe-yq-4.33.3-1.x86_64
     - iuf-cli-1.5.3-1.x86_64
     - libcsm-0.0.4-1.noarch
     - loftsman-1.2.0-3.x86_64
+    - metal-nexus-1.2.3-1.x86_64
+    - metal-observability-1.0.9-1.x86_64
 
 # Add some noos RPMs into this SLE repo to avoid breaking recipes which may
 # expect them to be found here
@@ -42,18 +46,14 @@ https://artifactory.algol60.net/artifactory/csm-rpms/hpe/stable/noos/:
   rpms:
     - bos-reporter-2.6.0-1.noarch
     - canu-1.7.5-1.x86_64
-    - cray-site-init-1.32.0-1.x86_64
     - craycli-0.82.9-1.aarch64
     - craycli-0.82.9-1.x86_64
     - csm-node-identity-1.0.22-1.noarch
     - csm-testing-1.16.51-1.noarch
     - goss-servers-1.16.51-1.noarch
-    - hpe-csm-goss-package-0.3.21-hpe3.x86_64
     - hpe-csm-scripts-0.5.7-1.noarch
     - ilorest-4.2.0.0-20.x86_64
     - manifestgen-1.3.10-1.noarch
-    - metal-nexus-1.2.3-1.x86_64
-    - metal-observability-1.0.9-1.x86_64
     - platform-utils-1.6.3-1.noarch
     - spire-agent-1.5.5-1.8.aarch64
     - spire-agent-1.5.5-1.8.x86_64