diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 02dd487..7c8034b 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -1,17 +1,10 @@
 - project:
     templates:
-      - tripleo-multinode-baremetal-minimal
-      - tripleo-multinode-container-minimal
       - check-requirements
+      - openstack-cover-jobs
+      - openstack-lower-constraints-jobs
       - openstack-python-jobs
       - openstack-python35-jobs
       - openstack-python36-jobs
-    check:
-      jobs:
-        - openstack-tox-lower-constraints
-        - openstack-tox-cover:
-            voting: false
-
-    gate:
-      jobs:
-        - openstack-tox-lower-constraints
+      - tripleo-multinode-baremetal-minimal
+      - tripleo-multinode-container-minimal