diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index ce969ca43..f39d71a37 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -9,6 +9,7 @@
       - tripleo-multinode-container-minimal-pipeline
       - tripleo-undercloud-jobs-pipeline
       - tripleo-build-containers-jobs
+      - tripleo-buildimage-jobs
       - tripleo-standalone-scenarios-pipeline
       - tripleo-upgrades-train-pipeline
     check:
@@ -110,28 +111,13 @@
             dependencies: *deps_cprovider
         - tripleo-buildimage-overcloud-full-centos-8:
             dependencies: *deps_unit_lint
-            files:
-              - ^image-yaml/.*$
         - tripleo-buildimage-ironic-python-agent-centos-8:
             dependencies: *deps_unit_lint
-            files:
-              - ^image-yaml/.*$
         - tripleo-buildimage-overcloud-hardened-full-centos-8:
             dependencies: *deps_unit_lint
-            files:
-              - ^image-yaml/.*$
     gate:
       queue: tripleo
       jobs:
         - openstack-tox-linters
         - tripleo-cross-tripleoclient-py37
         - tripleo-ci-centos-8-content-provider
-        - tripleo-buildimage-overcloud-full-centos-8:
-            files:
-              - ^image-yaml/.*$
-        - tripleo-buildimage-ironic-python-agent-centos-8:
-            files:
-              - ^image-yaml/.*$
-        - tripleo-buildimage-overcloud-hardened-full-centos-8:
-            files:
-              - ^image-yaml/.*$