diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 0c40dd7fce..a3e78469e7 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -38,14 +38,6 @@
         label: ubuntu-focal
       - name: secondary2
         label: ubuntu-focal
-    groups:
-      - name: switch
-        nodes:
-          - primary
-      - name: peers
-        nodes:
-          - secondary1
-          - secondary2
 
 - nodeset:
     name: kolla-ansible-centos8-multi
@@ -56,14 +48,6 @@
         label: centos-8
       - name: secondary2
         label: centos-8
-    groups:
-      - name: switch
-        nodes:
-          - primary
-      - name: peers
-        nodes:
-          - secondary1
-          - secondary2
 
 - nodeset:
     name: kolla-ansible-centos8s-multi
@@ -74,14 +58,6 @@
         label: centos-8-stream
       - name: secondary2
         label: centos-8-stream
-    groups:
-      - name: switch
-        nodes:
-          - primary
-      - name: peers
-        nodes:
-          - secondary1
-          - secondary2
 
 - nodeset:
     name: kolla-ansible-focal-nested-virt
@@ -116,17 +92,6 @@
         label: centos-8
       - name: secondary5
         label: centos-8
-    groups:
-      - name: switch
-        nodes:
-          - primary
-      - name: peers
-        nodes:
-          - secondary1
-          - secondary2
-          - secondary3
-          - secondary4
-          - secondary5
 
 - nodeset:
     name: kolla-ansible-centos8s-multi-monasca
@@ -143,17 +108,6 @@
         label: centos-8-stream
       - name: secondary5
         label: centos-8-stream
-    groups:
-      - name: switch
-        nodes:
-          - primary
-      - name: peers
-        nodes:
-          - secondary1
-          - secondary2
-          - secondary3
-          - secondary4
-          - secondary5
 
 - nodeset:
     name: kolla-ansible-focal-masakari