diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 1aa1a14b2..3a6fe272c 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -4,6 +4,9 @@
     - tripleo-ansible-molecule-jobs
     - release-notes-jobs-python3
     - openstack-python3-wallaby-jobs
+    - tripleo-multinode-container-minimal-pipeline
+    - tripleo-standalone-scenarios-pipeline
+    - tripleo-undercloud-jobs-pipeline
     check:
       jobs:
       - tripleo-ci-centos-8-content-provider:
@@ -20,27 +23,16 @@
           - ^README.rst
           - ^requirements.txt
           - ^tripleo_ansible/ansible_plugins/.*
-      - tripleo-ci-centos-8-containers-multinode: &containers_multinode
-          vars: &multi_consumer_vars
+      - tripleo-ci-centos-8-containers-undercloud-minion: &undercloud_minion
+          vars:
             consumer_job: true
-            build_container_images: false
-            tags:
-              - undercloud-setup
-              - undercloud-scripts
-              - undercloud-install
-              - undercloud-post-install
-              - tripleo-validations
-              - overcloud-scripts
-              - overcloud-prep-config
-              - overcloud-prep-containers
-              - overcloud-deploy
-              - overcloud-post-deploy
-              - overcloud-validate
-          dependencies: &deps
+            remove_tags:
+              - build
+          dependencies:
             - tripleo-ci-centos-8-content-provider
-          files: &containers_files
+          files:
           - ^tripleo_ansible/.*
-          irrelevant-files: &irrelevant_scenario_files
+          irrelevant-files:
           - .*.md$
           - .*.rst$
           - .*.txt$
@@ -52,81 +44,13 @@
           - ^tripleo_ansible/roles/.*/meta.*
           - ^tripleo_ansible/roles/test_deps/.*
           - ^zuul.d/.*
-      - tripleo-ci-centos-8-standalone: &basic_standalone
-          vars: &sa_consumer_vars
-            consumer_job: true
-            build_container_images: false
-            tags:
-              - standalone
-          dependencies: *deps
-          files: *containers_files
-          irrelevant-files: *irrelevant_scenario_files
-      - tripleo-ci-centos-8-containers-undercloud-minion: &undercloud_minion
-          vars: &undercloud_consumer_vars
-            consumer_job: true
-            tags:
-              - undercloud-setup
-              - undercloud-scripts
-              - undercloud-install
-              - undercloud-validate
-          dependencies: *deps
-          files: *containers_files
-          irrelevant-files: *irrelevant_scenario_files
-      - tripleo-ci-centos-8-undercloud-containers: &undercloud_containers
-          vars: *undercloud_consumer_vars
-          dependencies: *deps
-          files: *containers_files
-          irrelevant-files: *irrelevant_scenario_files
-      - tripleo-ci-centos-8-scenario001-standalone: &scenario001
-          vars: *sa_consumer_vars
-          dependencies: *deps
-          files:
-          - ^tripleo_ansible/roles/tripleo_ceph_.*/.*
-          - ^tripleo_ansible/roles/tripleo_hieradata/.*
-          - ^tripleo_ansible/roles/tripleo_upgrade_hiera/.*
-          - ^setup.*
-          irrelevant-files: *irrelevant_scenario_files
-      - tripleo-ci-centos-8-scenario002-standalone: &scenario002
-          vars: *sa_consumer_vars
-          dependencies: *deps
-          files:
-          - ^tripleo_ansible/roles/tripleo_hieradata/.*
-          - ^tripleo_ansible/roles/tripleo_upgrade_hiera/.*
-          irrelevant-files: *irrelevant_scenario_files
-      - tripleo-ci-centos-8-scenario003-standalone: &scenario003
-          vars: *sa_consumer_vars
-          dependencies: *deps
-          files:
-          - ^tripleo_ansible/roles/tripleo_create_admin/.*
-          - ^tripleo_ansible/roles/tripleo_hieradata/.*
-          - ^tripleo_ansible/roles/tripleo_upgrade_hiera/.*
-          irrelevant-files: *irrelevant_scenario_files
-      - tripleo-ci-centos-8-scenario004-standalone: &scenario004
-          vars: *sa_consumer_vars
-          dependencies: *deps
-          files:
-          - ^tripleo_ansible/roles/tripleo_ceph_.*/.*
-          irrelevant-files: *irrelevant_scenario_files
-      - tripleo-ci-centos-8-scenario010-standalone: &scenario010
-          vars: *sa_consumer_vars
-          dependencies: *deps
-          files:
-          - ^tripleo_ansible/roles/octavia_.*/.*
-          irrelevant-files: *irrelevant_scenario_files
+
     gate:
       jobs:
       - tripleo-ci-centos-8-content-provider
       - openstack-tox-linters: *tripleo-linters
       - openstack-tox-docs: *tripleo-docs
-      - tripleo-ci-centos-8-containers-multinode: *containers_multinode
       - tripleo-ci-centos-8-containers-undercloud-minion: *undercloud_minion
-      - tripleo-ci-centos-8-undercloud-containers: *undercloud_containers
-      - tripleo-ci-centos-8-standalone: *basic_standalone
-      - tripleo-ci-centos-8-scenario001-standalone: *scenario001
-      - tripleo-ci-centos-8-scenario002-standalone: *scenario002
-      - tripleo-ci-centos-8-scenario003-standalone: *scenario003
-      - tripleo-ci-centos-8-scenario004-standalone: *scenario004
-      - tripleo-ci-centos-8-scenario010-standalone: *scenario010
     post:
       jobs:
       - publish-openstack-python-branch-tarball