diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
deleted file mode 100644
index c1d7c1b..0000000
--- a/zuul.d/jobs.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- job:
-    name: openstack-ansible-deploy-aio_metal_barbican-centos-7
-    parent: openstack-ansible-deploy-aio
-    nodeset: centos-7
-    vars:
-      action: deploy
-      scenario: aio_metal_barbican
-
-- job:
-    name: openstack-ansible-deploy-aio_distro_metal_barbican-centos-7
-    parent: openstack-ansible-deploy-aio
-    nodeset: centos-7
-    vars:
-      action: deploy
-      scenario: aio_metal_barbican
-      install_method: distro
-
-- job:
-    name: openstack-ansible-deploy-aio_metal_barbican-opensuse-150
-    parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
-    vars:
-      action: deploy
-      scenario: aio_metal_barbican
-
-- job:
-    name: openstack-ansible-deploy-aio_distro_metal_barbican-opensuse-150
-    parent: openstack-ansible-deploy-aio
-    nodeset: opensuse-150
-    vars:
-      action: deploy
-      scenario: aio_metal_barbican
-      install_method: distro
-
-- job:
-    name: openstack-ansible-deploy-aio_metal_barbican-ubuntu-bionic
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-bionic
-    vars:
-      action: deploy
-      scenario: aio_metal_barbican
-
-- job:
-    name: openstack-ansible-deploy-aio_distro_metal_barbican-ubuntu-bionic
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-bionic
-    vars:
-      action: deploy
-      scenario: aio_metal_barbican
-      install_method: distro
-
-- job:
-    name: openstack-ansible-deploy-aio_metal_barbican-debian-stable
-    parent: openstack-ansible-deploy-aio
-    nodeset: debian-stable
-    vars:
-      action: deploy
-      scenario: aio_metal_barbican
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 070541e..39b71ab 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -15,22 +15,8 @@
 - project:
     templates:
       - check-requirements
+      - openstack-ansible-deploy-aio_metal-jobs
+      - openstack-ansible-deploy-aio_distro_metal-jobs
       - openstack-ansible-linters
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
-    check:
-      jobs:
-        - openstack-ansible-deploy-aio_metal_barbican-centos-7
-        - openstack-ansible-deploy-aio_metal_barbican-debian-stable
-        - openstack-ansible-deploy-aio_metal_barbican-ubuntu-bionic
-    gate:
-      jobs:
-        - openstack-ansible-deploy-aio_metal_barbican-centos-7
-        - openstack-ansible-deploy-aio_metal_barbican-debian-stable
-        - openstack-ansible-deploy-aio_metal_barbican-ubuntu-bionic
-    experimental:
-      jobs:
-        - openstack-ansible-deploy-aio_distro_metal_barbican-centos-7
-        - openstack-ansible-deploy-aio_distro_metal_barbican-opensuse-150
-        - openstack-ansible-deploy-aio_distro_metal_barbican-ubuntu-bionic
-        - openstack-ansible-deploy-aio_metal_barbican-opensuse-150