diff --git a/zuul.yaml b/zuul.yaml
index ff36fa71bf..9cbeef7cd5 100644
--- a/zuul.yaml
+++ b/zuul.yaml
@@ -304,9 +304,10 @@
       - zuul: openstack-infra/zuul-jobs
       - zuul: openstack-infra/openstack-zuul-jobs
     timeout: 1800
-    nodes:
-      - name: ubuntu-xenial
-        label: ubuntu-xenial
+    nodeset:
+      nodes:
+        - name: ubuntu-xenial
+          label: ubuntu-xenial
     secrets:
       - site_logs
 
@@ -327,9 +328,10 @@
     roles:
       - zuul: openstack-infra/zuul-jobs
     timeout: 1800
-    nodes:
-      - name: ubuntu-xenial
-        label: ubuntu-xenial
+    nodeset:
+      nodes:
+        - name: ubuntu-xenial
+          label: ubuntu-xenial
     secrets:
       - site_logs
 
@@ -347,9 +349,10 @@
       - zuul: openstack-infra/zuul-jobs
       - zuul: openstack-infra/openstack-zuul-jobs
     timeout: 1800
-    nodes:
-      - name: ubuntu-xenial
-        label: ubuntu-xenial
+    nodeset:
+      nodes:
+        - name: ubuntu-xenial
+          label: ubuntu-xenial
     secrets:
       - site_logs
 
@@ -587,7 +590,8 @@
 - job:
     name: release-wheel-mirror
     run: playbooks/wheel/release
-    nodes: []
+    nodeset:
+      nodes: []
     secrets:
       - name: afs
         secret: afsadmin_keytab