diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 534f4533e364e2653a33a4ceb345a314c7ef7b78..bfd158ae62a3e42479985ec90e40ae67364f9571 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -1,14 +1,13 @@
 ---
 - project:
     templates:
-      - release-notes-jobs
+      - build-openstack-sphinx-docs
+      - openstack-cover-jobs
+      - openstack-python35-jobs
+      - openstack-python-jobs
     check:
       jobs:
-        - openstack-tox-pep8
-        - openstack-tox-py27
-        - openstack-tox-py35
-        - openstack-tox-cover
-        - build-openstack-sphinx-docs
+        - build-openstack-releasenotes
         - kayobe-tox-ansible-syntax
         - kayobe-tox-ansible
         - kayobe-tox-molecule
@@ -18,11 +17,7 @@
     gate:
       queue: kayobe
       jobs:
-        - openstack-tox-pep8
-        - openstack-tox-py27
-        - openstack-tox-py35
-        - openstack-tox-cover
-        - build-openstack-sphinx-docs
+        - build-openstack-releasenotes
         - kayobe-tox-ansible-syntax
         - kayobe-tox-ansible
         - kayobe-tox-molecule