diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 963c49a..ccb3c38 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -20,6 +20,15 @@
       action: deploy
       scenario: aio_metal_heat
 
+- job:
+    name: openstack-ansible-deploy-aio_distro_metal_heat-centos-7
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-7
+    vars:
+      action: deploy
+      scenario: aio_metal_heat
+      install_method: distro
+
 - job:
     name: openstack-ansible-deploy-aio_metal_heat-opensuse-150
     parent: openstack-ansible-deploy-aio
@@ -28,6 +37,15 @@
       action: deploy
       scenario: aio_metal_heat
 
+- job:
+    name: openstack-ansible-deploy-aio_distro_metal_heat-opensuse-150
+    parent: openstack-ansible-deploy-aio
+    nodeset: opensuse-150
+    vars:
+      action: deploy
+      scenario: aio_metal_heat
+      install_method: distro
+
 - job:
     name: openstack-ansible-deploy-aio_metal_heat-ubuntu-bionic
     parent: openstack-ansible-deploy-aio
@@ -35,3 +53,12 @@
     vars:
       action: deploy
       scenario: aio_metal_heat
+
+- job:
+    name: openstack-ansible-deploy-aio_distro_metal_heat-ubuntu-bionic
+    parent: openstack-ansible-deploy-aio
+    nodeset: ubuntu-bionic
+    vars:
+      action: deploy
+      scenario: aio_metal_heat
+      install_method: distro
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 50abbed..219247c 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -14,11 +14,10 @@
 
 - project:
     templates:
-      - openstack-ansible-role-jobs
       - check-requirements
+      - openstack-ansible-linters
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
-      - openstack-ansible-role-distro_install-jobs
     check:
       jobs:
         - openstack-ansible-deploy-aio_metal_heat-centos-7
@@ -29,4 +28,7 @@
         - openstack-ansible-deploy-aio_metal_heat-ubuntu-bionic
     experimental:
       jobs:
+        - openstack-ansible-deploy-aio_distro_metal_heat-centos-7
+        - openstack-ansible-deploy-aio_distro_metal_heat-opensuse-150
+        - openstack-ansible-deploy-aio_distro_metal_heat-ubuntu-bionic
         - openstack-ansible-deploy-aio_metal_heat-opensuse-150