diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 000000000..e657ce2ce
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,4 @@
+- project:
+    templates:
+      - noop-jobs
+
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
deleted file mode 100644
index 7ec5fbf96..000000000
--- a/zuul.d/layout.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
-- project:
-    templates:
-      - tripleo-undercloud-jobs
-      - tripleo-multinode-baremetal-minimal
-      - tripleo-multinode-container-minimal
-      - tripleo-multinode-branchful
-      - publish-openstack-docs-pti
-      - release-notes-jobs-python3
-    check:
-      jobs:
-        - tripleo-ci-centos-7-3nodes-multinode:
-            files:
-              - config/general_config/featureset032.yml
-        - tripleo-ci-centos-7-scenario001-multinode-oooq:
-            files:
-              - config/general_config/featureset005.yml
-        - tripleo-ci-centos-7-scenario001-multinode-oooq-container:
-            files:
-              - config/general_config/featureset016.yml
-        - tripleo-ci-centos-7-scenario002-multinode-oooq:
-            files:
-              - config/general_config/featureset006.yml
-        - tripleo-ci-centos-7-scenario002-multinode-oooq-container:
-            files:
-              - config/general_config/featureset017.yml
-        - tripleo-ci-centos-7-scenario003-multinode-oooq:
-            files:
-              - config/general_config/featureset007.yml
-        - tripleo-ci-centos-7-scenario003-multinode-oooq-container:
-            files:
-              - config/general_config/featureset018.yml
-        - tripleo-ci-centos-7-scenario004-multinode-oooq:
-            files:
-              - config/general_config/featureset008.yml
-        - tripleo-ci-centos-7-scenario004-multinode-oooq-container:
-            files:
-              - config/general_config/featureset019.yml
-        - tripleo-ci-centos-7-scenario007-multinode-oooq:
-            files:
-              - config/general_config/featureset028.yml
-        - tripleo-ci-centos-7-scenario007-multinode-oooq-container:
-            files:
-              - config/general_config/featureset030.yml
-        - tripleo-ci-centos-7-scenario009-multinode-oooq:
-            files:
-              - config/general_config/featureset033.yml
-        - tripleo-ci-centos-7-standalone:
-            files:
-              - config/general_config/featureset052.yml
-        - openstack-tox-linters
-        - tripleo-ci-centos-7-scenario010-multinode-oooq-container:
-            files:
-              - config/general_config/featureset038.yml
-    gate:
-      queue: tripleo
-      jobs:
-        - tripleo-ci-centos-7-scenario001-multinode-oooq:
-            files:
-              - config/general_config/featureset005.yml
-        - tripleo-ci-centos-7-scenario001-multinode-oooq-container:
-            files:
-              - config/general_config/featureset016.yml
-        - tripleo-ci-centos-7-scenario002-multinode-oooq:
-            files:
-              - config/general_config/featureset006.yml
-        - tripleo-ci-centos-7-scenario002-multinode-oooq-container:
-            files:
-              - config/general_config/featureset017.yml
-        - tripleo-ci-centos-7-scenario003-multinode-oooq:
-            files:
-              - config/general_config/featureset007.yml
-        - tripleo-ci-centos-7-scenario003-multinode-oooq-container:
-            files:
-              - config/general_config/featureset018.yml
-        - tripleo-ci-centos-7-scenario004-multinode-oooq:
-            files:
-              - config/general_config/featureset008.yml
-        - tripleo-ci-centos-7-scenario004-multinode-oooq-container:
-            files:
-              - config/general_config/featureset019.yml
-        - tripleo-ci-centos-7-scenario007-multinode-oooq:
-            files:
-              - config/general_config/featureset028.yml
-        - tripleo-ci-centos-7-scenario007-multinode-oooq-container:
-            files:
-              - config/general_config/featureset030.yml
-        - openstack-tox-linters
-    experimental:
-      jobs:
-        - tripleo-ci-centos-7-scenario006-multinode-oooq:
-            files:
-              - config/general_config/featureset026.yml
-        - tripleo-ci-centos-7-scenario008-multinode-oooq:
-            files:
-              - config/general_config/featureset031.yml