diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index c6a88505..bd72e775 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -14,23 +14,16 @@
 
 - project:
     templates:
-      - openstack-ansible-role-jobs
       - check-requirements
+      - openstack-ansible-role-distro_install-jobs
+      - openstack-ansible-role-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
       jobs:
         - openstack-ansible-nfs_glance
         - openstack-ansible-v2_registry_enabled
-        - openstack-ansible-functional-distro_install-ubuntu-xenial
-        - openstack-ansible-functional-distro_install-centos-7
-        - openstack-ansible-functional-distro_install-opensuse-423
-        - openstack-ansible-functional-distro_install-opensuse-150
     gate:
       jobs:
         - openstack-ansible-nfs_glance
         - openstack-ansible-v2_registry_enabled
-        - openstack-ansible-functional-distro_install-ubuntu-xenial
-        - openstack-ansible-functional-distro_install-centos-7
-        - openstack-ansible-functional-distro_install-opensuse-423
-        - openstack-ansible-functional-distro_install-opensuse-150