diff --git a/zuul.d/sp-aaa-shadow.yaml b/zuul.d/sp-aaa-shadow.yaml
index e858a15..b4f3dfa 100644
--- a/zuul.d/sp-aaa-shadow.yaml
+++ b/zuul.d/sp-aaa-shadow.yaml
@@ -118,6 +118,26 @@
     parent: sp-shadowed
 
 - job:
+    name: openstack-tox-py35
+    parent: sp-shadowed
+
+- job:
+    name: openstack-tox-py36
+    parent: sp-shadowed
+
+- job:
+    name: openstack-tox-py37
+    parent: sp-shadowed
+
+- job:
+    name: openstack-tox-py38
+    parent: sp-shadowed
+
+- job:
+    name: openstack-tox-py38-arm64
+    parent: sp-shadowed
+
+- job:
     name: openstack-tox-py39-with-neutron-lib-master
     parent: sp-shadowed
 
@@ -236,3 +256,63 @@
       - name: tempest
         nodes:
           - controller
+
+- nodeset:
+    name: ubuntu-bionic
+    nodes:
+      name: controller
+      label: centos-base
+    groups:
+      - name: tempest
+        nodes:
+          - controller
+
+- nodeset:
+    name: ubuntu-focal
+    nodes:
+      name: controller
+      label: centos-base
+    groups:
+      - name: tempest
+        nodes:
+          - controller
+
+- nodeset:
+    name: ubuntu-focal-arm64
+    nodes:
+      name: controller
+      label: centos-base
+    groups:
+      - name: tempest
+        nodes:
+          - controller
+
+- nodeset:
+    name: ubuntu-jammy
+    nodes:
+      name: controller
+      label: centos-base
+    groups:
+      - name: tempest
+        nodes:
+          - controller
+
+- nodeset:
+    name: ubuntu-jammy-arm64
+    nodes:
+      name: controller
+      label: centos-base
+    groups:
+      - name: tempest
+        nodes:
+          - controller
+
+- nodeset:
+    name: ubuntu-xenial
+    nodes:
+      name: controller
+      label: centos-base
+    groups:
+      - name: tempest
+        nodes:
+          - controller