diff --git a/zuul.d/nodepool-nodesets.yaml b/zuul.d/nodepool-nodesets.yaml
index a180410..27dc75f 100644
--- a/zuul.d/nodepool-nodesets.yaml
+++ b/zuul.d/nodepool-nodesets.yaml
@@ -23,12 +23,6 @@
       - name: debian-bookworm-arm64
         label: debian-bookworm-arm64
 
-- nodeset:
-    name: debian-bullseye
-    nodes:
-      - name: debian-bullseye
-        label: debian-bullseye
-
 - nodeset:
     name: debian-bullseye-arm64
     nodes:
@@ -71,24 +65,12 @@
       - name: ubuntu-jammy-arm64
         label: ubuntu-jammy-arm64
 
-- nodeset:
-    name: ubuntu-jammy
-    nodes:
-      - name: ubuntu-jammy
-        label: ubuntu-jammy
-
 - nodeset:
     name: ubuntu-noble-arm64
     nodes:
       - name: ubuntu-noble-arm64
         label: ubuntu-noble-arm64
 
-- nodeset:
-    name: ubuntu-noble
-    nodes:
-      - name: ubuntu-noble
-        label: ubuntu-noble
-
 - nodeset:
     name: ubuntu-xenial
     nodes:
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index edbb21b..a6c719f 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -1,3 +1,8 @@
+# All nodesets with "niz-" in the name are temporary so that the zuul
+# tenant can opt-in to using them specifically.  Don't use them for
+# new work.
+
+# Deprecated, do not use this nodeset at all.
 - nodeset:
     name: niz-debian-bullseye-normal
     nodes:
@@ -10,50 +15,125 @@
       name: debian-bullseye
       label: niz-debian-bullseye-4GB
 
+- nodeset:
+    name: debian-bullseye-4GB
+    nodes:
+      name: debian-bullseye
+      label: niz-debian-bullseye-4GB
+
 - nodeset:
     name: niz-debian-bullseye-8GB
     nodes:
       name: debian-bullseye
       label: niz-debian-bullseye-8GB
 
+- nodeset:
+    name: debian-bullseye-8GB
+    nodes:
+      name: debian-bullseye
+      label: niz-debian-bullseye-8GB
+
+# A legacy nodeset from nodepool
+- nodeset:
+    name: debian-bullseye
+    nodes:
+      name: debian-bullseye
+      label: niz-debian-bullseye-8GB
+
 - nodeset:
     name: niz-debian-bullseye-16GB
     nodes:
       name: debian-bullseye
       label: niz-debian-bullseye-16GB
 
+- nodeset:
+    name: debian-bullseye-16GB
+    nodes:
+      name: debian-bullseye
+      label: niz-debian-bullseye-16GB
+
 - nodeset:
     name: niz-ubuntu-jammy-4GB
     nodes:
       name: ubuntu-jammy
       label: niz-ubuntu-jammy-4GB
 
+- nodeset:
+    name: ubuntu-jammy-4GB
+    nodes:
+      name: ubuntu-jammy
+      label: niz-ubuntu-jammy-4GB
+
 - nodeset:
     name: niz-ubuntu-jammy-8GB
     nodes:
       name: ubuntu-jammy
       label: niz-ubuntu-jammy-8GB
 
+- nodeset:
+    name: ubuntu-jammy-8GB
+    nodes:
+      name: ubuntu-jammy
+      label: niz-ubuntu-jammy-8GB
+
+# A legacy nodeset from nodepool
+- nodeset:
+    name: ubuntu-jammy
+    nodes:
+      name: ubuntu-jammy
+      label: niz-ubuntu-jammy-8GB
+
 - nodeset:
     name: niz-ubuntu-jammy-16GB
     nodes:
       name: ubuntu-jammy
       label: niz-ubuntu-jammy-16GB
 
+- nodeset:
+    name: ubuntu-jammy-16GB
+    nodes:
+      name: ubuntu-jammy
+      label: niz-ubuntu-jammy-16GB
+
 - nodeset:
     name: niz-ubuntu-noble-4GB
     nodes:
       name: ubuntu-noble
       label: niz-ubuntu-noble-4GB
 
+- nodeset:
+    name: ubuntu-noble-4GB
+    nodes:
+      name: ubuntu-noble
+      label: niz-ubuntu-noble-4GB
+
 - nodeset:
     name: niz-ubuntu-noble-8GB
     nodes:
       name: ubuntu-noble
       label: niz-ubuntu-noble-8GB
 
+- nodeset:
+    name: ubuntu-noble-8GB
+    nodes:
+      name: ubuntu-noble
+      label: niz-ubuntu-noble-8GB
+
+# A legacy nodeset from nodepool
+- nodeset:
+    name: ubuntu-noble
+    nodes:
+      name: ubuntu-noble
+      label: niz-ubuntu-noble-8GB
+
 - nodeset:
     name: niz-ubuntu-noble-16GB
     nodes:
       name: ubuntu-noble
       label: niz-ubuntu-noble-16GB
+
+- nodeset:
+    name: ubuntu-noble-16GB
+    nodes:
+      name: ubuntu-noble
+      label: niz-ubuntu-noble-16GB