diff --git a/zuul.yaml b/zuul.d/jobs.yaml
similarity index 100%
rename from zuul.yaml
rename to zuul.d/jobs.yaml
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
new file mode 100644
index 0000000..53d170a
--- /dev/null
+++ b/zuul.d/nodesets.yaml
@@ -0,0 +1,80 @@
+# Shared nodesets for all tenants
+- nodeset:
+    name: centos-7
+    nodes:
+      - name: centos-7
+        label: centos-7
+
+- nodeset:
+    name: debian-stable
+    nodes:
+      - name: debian-stretch
+        label: debian-stretch
+
+- nodeset:
+    name: fedora-latest
+    nodes:
+      - name: fedora-29
+        label: fedora-29
+
+- nodeset:
+    name: gentoo-17-0-systemd
+    nodes:
+      - name: gentoo-17-0-systemd
+        label: gentoo-17-0-systemd
+
+# Deprecated, please use opensuse-15 going forward
+- nodeset:
+    name: opensuse-423
+    nodes:
+      - name: opensuse-423
+        label: opensuse-423
+
+# Deprecated, please use opensuse-15 going forward
+- nodeset:
+    name: opensuse-150
+    nodes:
+      - name: opensuse-150
+        label: opensuse-150
+
+- nodeset:
+    name: opensuse-15
+    nodes:
+      - name: opensuse-15
+        label: opensuse-15
+
+- nodeset:
+    name: opensuse-tumbleweed
+    nodes:
+      - name: opensuse-tumbleweed
+        label: opensuse-tumbleweed
+
+- nodeset:
+    name: ubuntu-bionic
+    nodes:
+      - name: ubuntu-bionic
+        label: ubuntu-bionic
+
+- nodeset:
+    name: ubuntu-bionic-arm64
+    nodes:
+      - name: ubuntu-bionic-arm64
+        label: ubuntu-bionic-arm64
+
+- nodeset:
+    name: ubuntu-trusty
+    nodes:
+      - name: ubuntu-trusty
+        label: ubuntu-trusty
+
+- nodeset:
+    name: ubuntu-xenial-arm64
+    nodes:
+      - name: ubuntu-xenial-arm64
+        label: ubuntu-xenial-arm64
+
+- nodeset:
+    name: ubuntu-xenial
+    nodes:
+      - name: ubuntu-xenial
+        label: ubuntu-xenial