diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 5f5c4f1a6..d4e208558 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -4,23 +4,21 @@
       - build-openstack-docs-pti
       - build-release-notes-jobs-python3
       - check-requirements
+      - devstack-tobiko-gate
+      - devstack-tobiko-faults
       - docs-on-readthedocs
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python3-wallaby-jobs
       - publish-to-pypi
-      - devstack-tobiko-gate
     vars:
         rtd_webhook_id: '84947'
 
-    check:
+    check: &check_pipeline
       jobs:
-        - devstack-tobiko-faults-ubuntu
         - tobiko-infrared
 
-    gate:
-      jobs:
-        - tobiko-infrared
+    gate: *check_pipeline
 
     periodic:
       jobs: