diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 066d5346ca..5b398e7209 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -50,14 +50,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
@@ -68,14 +60,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
@@ -86,14 +70,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
@@ -128,17 +104,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
@@ -155,17 +120,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