diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index b8960a594b..4a4dfa6372 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -1,24 +1,24 @@
 - project:
     templates:
-      - tripleo-undercloud-jobs
-      - tripleo-multinode-container-minimal
+      - tripleo-undercloud-jobs-pipeline
+      - tripleo-multinode-container-minimal-pipeline
       - check-requirements
       - release-notes-jobs-python3
-      - tripleo-standalone-scenarios-full
+      - tripleo-standalone-scenarios-pipeline
       - openstack-python3-ussuri-jobs
-      - tripleo-standalone-multinode-ipa
+      - tripleo-standalone-multinode-ipa-pipeline
     check:
       jobs:
         - openstack-tox-pep8
         - openstack-tox-lower-constraints
-        - tripleo-ci-centos-8-containers-multinode:
+        - openstack-tox-tht
+        - tripleo-ci-centos-8-content-provider:
             dependencies: &deps_unit_lint
               - openstack-tox-pep8
               - openstack-tox-tht
         - tripleo-ci-centos-7-undercloud-containers:
             dependencies: *deps_unit_lint
-        - tripleo-ci-centos-8-standalone:
-            dependencies: *deps_unit_lint
+        - tripleo-ci-centos-8-standalone
         - tripleo-ci-centos-7-standalone-upgrade-stein:
             dependencies: *deps_unit_lint
         - tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades:
@@ -74,21 +74,8 @@
               - ^network/endpoints/.*$
               - ^common/.*$
               - zuul.d/*
-        - tripleo-ci-centos-8-scenario001-standalone:
-            dependencies: *deps_unit_lint
-        - tripleo-ci-centos-8-scenario002-standalone:
-            dependencies: *deps_unit_lint
-        - tripleo-ci-centos-8-scenario003-standalone:
-            dependencies: *deps_unit_lint
-        - tripleo-ci-centos-8-scenario004-standalone:
-            dependencies: *deps_unit_lint
-        - tripleo-ci-centos-8-scenario012-standalone:
-            dependencies: *deps_unit_lint
         - tripleo-ci-centos-7-containerized-undercloud-upgrades:
             dependencies: *deps_unit_lint
-        - tripleo-ci-centos-8-containers-undercloud-minion:
-            dependencies: *deps_unit_lint
-        - openstack-tox-tht
     gate:
       queue: tripleo
       jobs: