diff --git a/zuul.d/2023.2.yaml b/zuul.d/2023.2.yaml
index 3de5665fa6..a6a9b0caa3 100644
--- a/zuul.d/2023.2.yaml
+++ b/zuul.d/2023.2.yaml
@@ -36,7 +36,6 @@
 - job:
     name: openstack-helm-cinder-2023-2-ubuntu_jammy
     parent: openstack-helm-cinder-rook
-    nodeset: openstack-helm-3nodes-ubuntu_jammy
     vars:
       osh_params:
         openstack_release: "2023.2"
@@ -56,7 +55,7 @@
 - job:
     name: openstack-helm-compute-kit-metallb-2023-2-ubuntu_jammy
     parent: openstack-helm-compute-kit
-    nodeset: openstack-helm-1node-2nodes-ubuntu_jammy
+    nodeset: openstack-helm-1node-3nodes-ubuntu_jammy
     vars:
       metallb_setup: true
       osh_params:
diff --git a/zuul.d/2024.1.yaml b/zuul.d/2024.1.yaml
index 025814aab9..ff6c7aa938 100644
--- a/zuul.d/2024.1.yaml
+++ b/zuul.d/2024.1.yaml
@@ -36,7 +36,6 @@
 - job:
     name: openstack-helm-cinder-2024-1-ubuntu_jammy
     parent: openstack-helm-cinder-rook
-    nodeset: openstack-helm-3nodes-ubuntu_jammy
     vars:
       osh_params:
         openstack_release: "2024.1"
@@ -56,7 +55,6 @@
 - job:
     name: openstack-helm-compute-kit-rook-2024-1-ubuntu_jammy
     parent: openstack-helm-compute-kit-rook
-    nodeset: openstack-helm-5nodes-ubuntu_jammy
     vars:
       metallb_setup: true
       osh_params:
@@ -68,7 +66,7 @@
 - job:
     name: openstack-helm-compute-kit-metallb-2024-1-ubuntu_jammy
     parent: openstack-helm-compute-kit
-    nodeset: openstack-helm-1node-2nodes-ubuntu_jammy
+    nodeset: openstack-helm-1node-3nodes-ubuntu_jammy
     vars:
       metallb_setup: true
       osh_params:
@@ -92,7 +90,7 @@
 - job:
     name: openstack-helm-compute-kit-cilium-metallb-2024-1-ubuntu_jammy
     parent: openstack-helm-compute-kit
-    nodeset: openstack-helm-1node-2nodes-ubuntu_jammy
+    nodeset: openstack-helm-1node-3nodes-ubuntu_jammy
     vars:
       calico_setup: false
       cilium_setup: true
@@ -107,7 +105,7 @@
 - job:
     name: openstack-helm-compute-kit-flannel-metallb-2024-1-ubuntu_jammy
     parent: openstack-helm-compute-kit
-    nodeset: openstack-helm-1node-2nodes-ubuntu_jammy
+    nodeset: openstack-helm-1node-3nodes-ubuntu_jammy
     vars:
       calico_setup: false
       flannel_setup: true
@@ -121,7 +119,7 @@
 - job:
     name: openstack-helm-compute-kit-helm-repo-public-2024-1-ubuntu_jammy
     parent: openstack-helm-compute-kit-helm-repo-public
-    nodeset: openstack-helm-1node-2nodes-ubuntu_jammy
+    nodeset: openstack-helm-1node-3nodes-ubuntu_jammy
     vars:
       metallb_setup: true
       osh_params:
@@ -159,7 +157,6 @@
 - job:
     name: openstack-helm-tls-2024-1-ubuntu_jammy
     parent: openstack-helm-tls
-    nodeset: openstack-helm-5nodes-ubuntu_jammy
     vars:
       osh_params:
         openstack_release: "2024.1"
diff --git a/zuul.d/2024.2.yaml b/zuul.d/2024.2.yaml
index 7c76e7c8ef..dd7a8b3597 100644
--- a/zuul.d/2024.2.yaml
+++ b/zuul.d/2024.2.yaml
@@ -14,7 +14,6 @@
 - job:
     name: openstack-helm-cinder-2024-2-ubuntu_jammy
     parent: openstack-helm-cinder-rook
-    nodeset: openstack-helm-3nodes-ubuntu_jammy
     vars:
       osh_params:
         openstack_release: "2024.2"
@@ -24,7 +23,7 @@
 - job:
     name: openstack-helm-compute-kit-2024-2-ubuntu_jammy
     parent: openstack-helm-compute-kit
-    nodeset: openstack-helm-1node-2nodes-ubuntu_jammy
+    nodeset: openstack-helm-1node-3nodes-ubuntu_jammy
     timeout: 10800
     vars:
       metallb_setup: true
@@ -37,7 +36,7 @@
 - job:
     name: openstack-helm-compute-kit-cilium-metallb-2024-2-ubuntu_jammy
     parent: openstack-helm-compute-kit
-    nodeset: openstack-helm-1node-2nodes-ubuntu_jammy
+    nodeset: openstack-helm-1node-3nodes-ubuntu_jammy
     vars:
       calico_setup: false
       cilium_setup: true
@@ -51,7 +50,7 @@
 - job:
     name: openstack-helm-compute-kit-flannel-metallb-2024-2-ubuntu_jammy
     parent: openstack-helm-compute-kit
-    nodeset: openstack-helm-1node-2nodes-ubuntu_jammy
+    nodeset: openstack-helm-1node-3nodes-ubuntu_jammy
     vars:
       calico_setup: false
       flannel_setup: true
@@ -65,7 +64,7 @@
 - job:
     name: openstack-helm-compute-kit-helm-repo-public-2024-2-ubuntu_jammy
     parent: openstack-helm-compute-kit-helm-repo-public
-    nodeset: openstack-helm-1node-2nodes-ubuntu_jammy
+    nodeset: openstack-helm-1node-3nodes-ubuntu_jammy
     vars:
       metallb_setup: true
       osh_params:
@@ -103,7 +102,6 @@
 - job:
     name: openstack-helm-tls-2024-2-ubuntu_jammy
     parent: openstack-helm-tls
-    nodeset: openstack-helm-5nodes-ubuntu_jammy
     vars:
       osh_params:
         openstack_release: "2024.2"
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 10d64a7fa4..2576b23b95 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -140,6 +140,7 @@
 - job:
     name: openstack-helm-compute-kit-rook
     parent: openstack-helm-deploy
+    nodeset: openstack-helm-5nodes-ubuntu_jammy
     abstract: true
     vars:
       gate_scripts:
@@ -294,6 +295,7 @@
 - job:
     name: openstack-helm-cinder-rook
     parent: openstack-helm-deploy
+    nodeset: openstack-helm-5nodes-ubuntu_jammy
     abstract: true
     files:
       - ^cinder/.*$
@@ -371,6 +373,7 @@
 - job:
     name: openstack-helm-tls
     parent: openstack-helm-deploy
+    nodeset: openstack-helm-5nodes-ubuntu_jammy
     abstract: true
     # NOTE(kozhukalov): The job is quite unstable now. Let's
     # temporarily disable voting for this job to unblock the gate.