diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 1122a42cc..22197a0bb 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -16,69 +16,11 @@
         - openstack-tox-linters
         - openstack-tox-py36
         - openstack-tox-py37
-        - tripleo-build-containers-ubi-8:
+        - tripleo-ci-centos-8-content-provider:
             dependencies: &deps_unit_lint
               - openstack-tox-linters
               - openstack-tox-py36
               - openstack-tox-py37
-            files:
-              - ^container-images/.*$
-              - ^tripleo_common/image/builder/.*$
-        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates:
-            vars: &multinode_vars
-              consumer_job: true
-              build_container_images: false
-              remove_tags:
-                - build
-            dependencies: &content-provider-job
-              - tripleo-ci-centos-8-content-provider
-            files:
-              - workbooks/package_update.yaml
-              - workbooks/baremetal.yaml
-              - ^container-images/.*$
-              - tripleo_common/actions/deployment.py
-              - tripleo_common/actions/container_images.py
-              - tripleo_common/image/kolla_builder.py
-              - scripts/.*$
-        - tripleo-ci-centos-8-scenario001-standalone:
-            dependencies: *content-provider-job
-            vars: &standalone_vars
-              consumer_job: true
-              build_container_images: false
-              remove_tags:
-                - build
-            files:
-              - ^container-images/tcib/base/collectd.*$
-              - ^container-images/tcib/base/os/aodh.*$
-              - ^container-images/tcib/base/os/ceilometer.*$
-              - ^container-images/tcib/base/os/cinder.*$
-              - ^container-images/tcib/base/os/gnocchi.*$
-              - ^container-images/tcib/base/os/heat.*$
-              - ^container-images/tcib/base/qdrouterd.*$
-              - ^container-images/tcib/base/rabbitmq.*$
-              - ^container-images/tcib/base/redis.*$
-        - tripleo-ci-centos-8-scenario003-standalone:
-            dependencies: *content-provider-job
-            vars: *standalone_vars
-            files:
-              - ^container-images/tcib/base/os/designate.*$
-              - ^container-images/tcib/base/os/mistral.*$
-              - ^container-images/tcib/base/os/sahara.*$
-        - tripleo-ci-centos-8-scenario004-standalone:
-            dependencies: *content-provider-job
-            vars: *standalone_vars
-            files:
-              - ^container-images/tcib/base/os/manila.*$
-        - tripleo-ci-centos-8-scenario007-standalone:
-            dependencies: *content-provider-job
-            vars: *standalone_vars
-            files:
-              - ^container-images/tcib/base/os/neutron.*$
-        - tripleo-ci-centos-8-scenario010-standalone:
-            dependencies: *content-provider-job
-            vars: *standalone_vars
-            files:
-              - ^container-images/tcib/base/os/octavia.*$
         - tripleo-buildimage-overcloud-full-centos-8:
             dependencies: *deps_unit_lint
         - tripleo-buildimage-ironic-python-agent-centos-8: