diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index 3e328c542..78ea23294 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -219,6 +219,7 @@
 - job:
     name: kuryr-kubernetes-octavia-base-ovs
     parent: kuryr-kubernetes-base-ovs
+    nodeset: kuryr-nested-virt-ubuntu-focal
     description: |
       Kuryr-Kubernetes tempest job using octavia
     required-projects:
diff --git a/.zuul.d/nodesets.yaml b/.zuul.d/nodesets.yaml
index 097e8daf6..8bc314f2d 100644
--- a/.zuul.d/nodesets.yaml
+++ b/.zuul.d/nodesets.yaml
@@ -31,3 +31,33 @@
       - name: tempest
         nodes:
           - controller
+
+- nodeset:
+    name: kuryr-nested-virt-two-node-focal
+    nodes:
+      - name: controller
+        label: nested-virt-ubuntu-focal
+      - name: compute1
+        label: nested-virt-ubuntu-focal
+    groups:
+      # Node where tests are executed and test results collected
+      - name: tempest
+        nodes:
+          - controller
+      # Nodes running the compute service
+      - name: compute
+        nodes:
+          - controller
+          - compute1
+      # 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
diff --git a/.zuul.d/tempest-jobs.yaml b/.zuul.d/tempest-jobs.yaml
index d55ac9756..3cac5a2d2 100644
--- a/.zuul.d/tempest-jobs.yaml
+++ b/.zuul.d/tempest-jobs.yaml
@@ -46,6 +46,7 @@
 - job:
     name: kuryr-kubernetes-tempest-defaults
     parent: kuryr-kubernetes-octavia-base
+    nodeset: kuryr-nested-virt-ubuntu-focal
     description: |
       Kuryr-Kubernetes tempest job running kuryr containerized with OVN,
       Octavias amphora, default set of handlers, default SG driver and default
@@ -82,6 +83,7 @@
 
 - job:
     name: kuryr-kubernetes-tempest-ipv6
+    nodeset: kuryr-nested-virt-ubuntu-focal
     parent: kuryr-kubernetes-octavia-base
     description: |
       Kuryr-Kubernetes tempest job running kuryr containerized with IPv6 pod
@@ -232,7 +234,6 @@
 - job:
     name: kuryr-kubernetes-tempest-amphora-ovs
     parent: kuryr-kubernetes-octavia-base-ovs
-    nodeset: kuryr-nested-virt-ubuntu-focal
     vars:
       devstack_localrc:
         KURYR_EP_DRIVER_OCTAVIA_PROVIDER: amphora
diff --git a/.zuul.d/tempest-multinode-jobs.yaml b/.zuul.d/tempest-multinode-jobs.yaml
index 8ceb062e6..d344948c1 100644
--- a/.zuul.d/tempest-multinode-jobs.yaml
+++ b/.zuul.d/tempest-multinode-jobs.yaml
@@ -17,7 +17,7 @@
     parent: kuryr-kubernetes-octavia-base
     description: |
         Kuryr-Kubernetes tempest multinode job with OVN
-    nodeset: openstack-two-node-focal
+    nodeset: kuryr-nested-virt-two-node-focal
     host-vars:
       controller:
         devstack_plugins:
@@ -98,7 +98,7 @@
     parent: kuryr-kubernetes-octavia-base-ovs
     description: |
         Kuryr-Kubernetes tempest multinode job with OVS
-    nodeset: openstack-two-node-focal
+    nodeset: kuryr-nested-virt-two-node-focal
     group-vars:
       subnode:
         devstack_plugins: