diff --git a/zuul.d/nodeset.yaml b/zuul.d/nodeset.yaml
index 57873183f3..14f07557a9 100644
--- a/zuul.d/nodeset.yaml
+++ b/zuul.d/nodeset.yaml
@@ -1,4 +1,8 @@
 ---
+#
+# Non CRC nodesets
+#
+
 - nodeset:
     name: centos-stream-9
     nodes:
@@ -23,305 +27,15 @@
       - name: peers
         nodes: []
 
-- nodeset:
-    name: centos-9-medium-crc-extracted-2-30-0-3xl
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-medium
-      - name: crc
-        label: coreos-crc-extracted-2-30-0-3xl
-    groups:
-      - name: computes
-        nodes: []
-      - name: ocps
-        nodes:
-          - crc
-
-- nodeset:
-    name: centos-9-crc-2-30-0-xxl
-    nodes:
-      - name: controller
-        label: centos-9-stream-crc-2-30-0-xxl
-
-- nodeset:
-    name: centos-9-medium-centos-9-crc-extracted-2.30-3xl
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-medium
-      - name: compute-0
-        label: cloud-centos-9-stream-tripleo
-      - name: crc
-        label: coreos-crc-extracted-2-30-0-3xl
-    groups:
-      - name: computes
-        nodes:
-          - compute-0
-      - name: ocps
-        nodes:
-          - crc
-
-- nodeset:
-    name: centos-9-crc-2-30-0-3xl
-    nodes:
-      - name: controller
-        label: centos-9-stream-crc-2-30-0-3xl
-
-- nodeset:
-    name: centos-9-medium-3x-centos-9-crc-extracted-2-30-0-xxl
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-medium
-      - name: compute-0
-        label: cloud-centos-9-stream-tripleo
-      - name: compute-1
-        label: cloud-centos-9-stream-tripleo
-      - name: compute-2
-        label: cloud-centos-9-stream-tripleo
-      - name: crc
-        label: coreos-crc-extracted-2-30-0-xxl
-    groups:
-      - name: computes
-        nodes:
-          - compute-0
-          - compute-1
-          - compute-2
-      - name: ocps
-        nodes:
-          - crc
-
-- nodeset:
-    name: centos-9-crc-2-30-0-6xlarge
-    nodes:
-      - name: controller
-        label: centos-9-stream-crc-2-30-0-6xlarge
-
-- nodeset:
-    name: centos-9-crc-2-30-0-xl
-    nodes:
-      - name: controller
-        label: centos-9-stream-crc-2-30-0-xl
-
-- nodeset:
-    name: 4x-centos-9-medium
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-medium
-      - name: compute-0
-        label: cloud-centos-9-stream-tripleo-medium
-      - name: compute-1
-        label: cloud-centos-9-stream-tripleo-medium
-      - name: crc
-        label: cloud-centos-9-stream-tripleo-medium
-    groups:
-      - name: computes
-        nodes:
-          - compute-0
-          - compute-1
-      - name: ocps
-        nodes:
-          - crc
-
 #
-# CRC-2.36 (OCP4.15) nodesets
+# CRC-2.30 (OCP4.14) nodesets
 #
 
 - nodeset:
-    name: centos-9-medium-crc-extracted-2-36-0-3xl
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-medium
-      - name: crc
-        label: coreos-crc-extracted-2-36-0-3xl
-    groups:
-      - name: computes
-        nodes: []
-      - name: ocps
-        nodes:
-          - crc
-
-- nodeset:
-    name: centos-9-crc-2-36-0-xxl
-    nodes:
-      - name: controller
-        label: centos-9-stream-crc-2-36-0-xxl
-
-- nodeset:
-    name: centos-9-rhel-9-2-crc-extracted-2-36-0-3xl
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo
-      - name: crc
-        label: coreos-crc-extracted-2-36-0-3xl
-      - name: standalone
-        label: cloud-rhel-9-2-tripleo
-    groups:
-      - name: computes
-        nodes: []
-      - name: ocps
-        nodes:
-          - crc
-      - name: rh-subscription
-        nodes:
-          - standalone
-
-- nodeset:
-    name: centos-9-multinode-rhel-9-2-crc-extracted-2-36-0-3xl
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo
-      - name: crc
-        label: coreos-crc-extracted-2-36-0-3xl
-      - name: undercloud
-        label: cloud-rhel-9-2-tripleo
-      - name: overcloud-controller-0
-        label: cloud-rhel-9-2-tripleo
-      - name: overcloud-controller-1
-        label: cloud-rhel-9-2-tripleo
-      - name: overcloud-controller-2
-        label: cloud-rhel-9-2-tripleo
-      - name: overcloud-novacompute-0
-        label: cloud-rhel-9-2-tripleo
-      - name: overcloud-novacompute-1
-        label: cloud-rhel-9-2-tripleo
-      - name: overcloud-novacompute-2
-        label: cloud-rhel-9-2-tripleo
-    groups:
-      - name: computes
-        nodes: []
-      - name: ocps
-        nodes:
-          - crc
-      - name: rh-subscription
-        nodes:
-          - undercloud
-          - overcloud-controller-0
-          - overcloud-controller-1
-          - overcloud-controller-2
-          - overcloud-novacompute-0
-          - overcloud-novacompute-1
-          - overcloud-novacompute-2
-      - name: tripleo_controllers
-        nodes:
-          - overcloud-controller-0
-          - overcloud-controller-1
-          - overcloud-controller-2
-      - name: tripleo_computes
-        nodes:
-          - overcloud-novacompute-0
-          - overcloud-novacompute-1
-          - overcloud-novacompute-2
-
-- nodeset:
-    name: centos-9-multinode-rhel-9-2-crc-extracted-2-36-0-3xl-novacells
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo
-      - name: crc
-        label: coreos-crc-extracted-2-36-0-3xl
-      - name: undercloud
-        label: cloud-rhel-9-2-tripleo
-      - name: overcloud-controller-0
-        label: cloud-rhel-9-2-tripleo
-      - name: cell1-controller-0
-        label: cloud-rhel-9-2-tripleo
-      - name: cell1-compute-0
-        label: cloud-rhel-9-2-tripleo
-      - name: cell2-controller-compute-0
-        label: cloud-rhel-9-2-tripleo
-    groups:
-      - name: computes
-        nodes: []
-      - name: ocps
-        nodes:
-          - crc
-      - name: rh-subscription
-        nodes:
-          - undercloud
-          - overcloud-controller-0
-          - cell1-controller-0
-          - cell2-controller-compute-0
-          - cell1-compute-0
-
-- nodeset:
-    name: centos-9-medium-centos-9-crc-extracted-2-36-0-3xl
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-medium
-      - name: compute-0
-        label: cloud-centos-9-stream-tripleo
-      - name: crc
-        label: coreos-crc-extracted-2-36-0-3xl
-    groups:
-      - name: computes
-        nodes:
-          - compute-0
-      - name: ocps
-        nodes:
-          - crc
-
-- nodeset:
-    name: centos-9-crc-2-36-0-3xl
+    name: centos-9-crc-2-30-0-6xlarge # TODO(Lewis) Remove when longer used by weirdo-validate-buildsys-tags-cifmw-crc-podified-edpm-baremetal-base
     nodes:
       - name: controller
-        label: centos-9-stream-crc-2-36-0-3xl
-
-- nodeset:
-    name: centos-9-medium-3x-centos-9-crc-extracted-2-36-0-xxl
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-medium
-      - name: compute-0
-        label: cloud-centos-9-stream-tripleo
-      - name: compute-1
-        label: cloud-centos-9-stream-tripleo
-      - name: compute-2
-        label: cloud-centos-9-stream-tripleo
-      - name: crc
-        label: coreos-crc-extracted-2-36-0-xxl
-    groups:
-      - name: computes
-        nodes:
-          - compute-0
-          - compute-1
-          - compute-2
-      - name: ocps
-        nodes:
-          - crc
-
-- nodeset:
-    name: centos-9-medium-3x-centos-9-crc-extracted-2-36-0-3xl
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-medium
-      - name: compute-0
-        label: cloud-centos-9-stream-tripleo
-      - name: compute-1
-        label: cloud-centos-9-stream-tripleo
-      - name: compute-2
-        label: cloud-centos-9-stream-tripleo
-      - name: crc
-        label: coreos-crc-extracted-2-36-0-3xl
-    groups:
-      - name: computes
-        nodes:
-          - compute-0
-          - compute-1
-          - compute-2
-      - name: ocps
-        nodes:
-          - crc
-
-- nodeset:
-    name: centos-9-crc-2-36-0-6xlarge
-    nodes:
-      - name: controller
-        label: centos-9-stream-crc-2-36-0-6xlarge
-
-- nodeset:
-    name: centos-9-crc-2-36-0-xl
-    nodes:
-      - name: controller
-        label: centos-9-stream-crc-2-36-0-xl
+        label: centos-9-stream-crc-2-30-0-6xlarge
 
 #
 # CRC-2.39 (OCP4.16) nodesets