diff --git a/zuul.d/nodes.yaml b/zuul.d/nodes.yaml
new file mode 100644
index 000000000..8224394d9
--- /dev/null
+++ b/zuul.d/nodes.yaml
@@ -0,0 +1,32 @@
+- nodeset:
+    name: tobiko-multinode
+    nodes:
+      - name: controller
+        label: ubuntu-bionic
+      - name: compute1
+        label: ubuntu-bionic
+      - name: compute2
+        label: ubuntu-bionic
+    groups:
+      # Node where tests are executed and test results collected
+      - name: tempest
+        nodes:
+          - controller
+      # Nodes running the compute service
+      - name: compute
+        nodes:
+          # - controller
+          - compute1
+          - compute2
+      # Nodes that are not the controller
+      - name: subnode
+        nodes:
+          - compute1
+      # Switch node for multinode networking setup
+      - name: switch
+        nodes:
+          - controller
+      # Peer nodes for multinode networking setup
+      - name: peers
+        nodes:
+          - compute1
\ No newline at end of file
diff --git a/zuul.d/tobiko-devstack.yaml b/zuul.d/tobiko-devstack.yaml
index 8f67c22c8..001ae60d2 100644
--- a/zuul.d/tobiko-devstack.yaml
+++ b/zuul.d/tobiko-devstack.yaml
@@ -62,7 +62,7 @@
 - job:
     name: tobiko-devstack-multinode
     parent: tobiko-devstack
-    nodeset: openstack-two-node-bionic
+    nodeset: tobiko-multinode
     abstract: true
     description: |
       Base Tobiko devstack job with multinode.