diff --git a/zuul.d/nodes.yaml b/zuul.d/nodes.yaml
index 2d86d507a..d70bfac4d 100644
--- a/zuul.d/nodes.yaml
+++ b/zuul.d/nodes.yaml
@@ -66,43 +66,3 @@
          nodes:
            - compute1
            - compute2
-
-
-- nodeset:
-     name: openstack-four-node-centos-7
-     nodes:
-       - name: controller
-         label: centos-7
-       - name: compute1
-         label: centos-7
-       - name: compute2
-         label: centos-7
-       - name: compute3
-         label: centos-7
-     groups:
-       # Node where tests are executed and test results collected
-       - name: tempest
-         nodes:
-           - controller
-       # Nodes running the compute service
-       - name: compute
-         nodes:
-           - compute1
-           - compute2
-           - compute3
-       # Nodes that are not the controller
-       - name: subnode
-         nodes:
-           - compute1
-           - compute2
-           - compute3
-       # Switch node for multinode networking setup
-       - name: switch
-         nodes:
-           - controller
-       # Peer nodes for multinode networking setup
-       - name: peers
-         nodes:
-           - compute1
-           - compute2
-           - compute3
diff --git a/zuul.d/tobiko-devstack.yaml b/zuul.d/tobiko-devstack.yaml
index b5fb77bbc..b78915429 100644
--- a/zuul.d/tobiko-devstack.yaml
+++ b/zuul.d/tobiko-devstack.yaml
@@ -164,7 +164,7 @@
 - job:
     name: tobiko-devstack-scenario-centos-7
     parent: tobiko-devstack-scenario-multinode
-    nodeset: openstack-four-node-centos-7
+    nodeset: openstack-three-node-centos-7
     voting: false
     vars:
       devstack_localrc:
@@ -176,7 +176,6 @@
     name: tobiko-devstack-scenario-centos-7-queens
     parent: tobiko-devstack-scenario-centos-7
     override-checkout: stable/queens
-    nodeset: openstack-three-node-centos-7
     voting: false
 
 
@@ -184,7 +183,6 @@
     name: tobiko-devstack-scenario-centos-7-rocky
     parent: tobiko-devstack-scenario-centos-7
     override-checkout: stable/rocky
-    nodeset: openstack-three-node-centos-7
     voting: false
 
 
@@ -192,7 +190,6 @@
     name: tobiko-devstack-scenario-centos-7-stein
     parent: tobiko-devstack-scenario-centos-7
     override-checkout: stable/stein
-    nodeset: openstack-three-node-centos-7
     voting: false
 
 
@@ -200,7 +197,6 @@
     name: tobiko-devstack-scenario-centos-7-train
     parent: tobiko-devstack-scenario-centos-7
     override-checkout: stable/train
-    nodeset: openstack-three-node-centos-7
     voting: false