diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index eda454269c..719df5abac 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1835,10 +1835,7 @@ projects:
   - name: stackforge/saml-generator
     template:
       - name: merge-check
-    check:
-      - noop
-    gate:
-      - noop
+      - name: noop-jobs
 
   - name: stackforge/gertty
     template:
@@ -4021,10 +4018,7 @@ projects:
   - name: stackforge/merlin
     template:
       - name: merge-check
-    check:
-      - noop
-    gate:
-      - noop
+      - name: noop-jobs
 
   - name: stackforge/milk
     template:
@@ -4719,10 +4713,7 @@ projects:
   - name: stackforge/python-rackclient
     template:
       - name: merge-check
-    check:
-      - noop
-    gate:
-      - noop
+      - name: noop-jobs
 
   - name: stackforge/python-rallyclient
     template:
@@ -4789,10 +4780,7 @@ projects:
   - name: stackforge/radar
     template:
       - name: merge-check
-    check:
-      - noop
-    gate:
-      - noop
+      - name: noop-jobs
 
   - name: stackforge/rally
     template:
@@ -5071,10 +5059,7 @@ projects:
   - name: stackforge/windows-diskimage-builder
     template:
       - name: merge-check
-    check:
-      - noop
-    gate:
-      - noop
+      - name: noop-jobs
 
   - name: stackforge/wsme
     template:
@@ -5122,10 +5107,7 @@ projects:
   - name: stackforge/namos
     template:
       - name: merge-check
-    check:
-      - noop
-    gate:
-      - noop
+      - name: noop-jobs
 
   - name: stackforge/stacktach
     template:
@@ -5213,18 +5195,12 @@ projects:
   - name: stackforge/xstatic-angular-animate
     template:
       - name: merge-check
-    check:
-      - noop
-    gate:
-      - noop
+      - name: noop-jobs
 
   - name: stackforge/xstatic-angular-bootstrap
     template:
       - name: merge-check
-    check:
-      - noop
-    gate:
-      - noop
+      - name: noop-jobs
 
   - name: stackforge/xstatic-angular-cookies
     template:
@@ -5239,10 +5215,7 @@ projects:
   - name: stackforge/xstatic-angular-sanitize
     template:
       - name: merge-check
-    check:
-      - noop
-    gate:
-      - noop
+      - name: noop-jobs
 
   - name: stackforge/xstatic-bootstrap-datepicker
     template:
@@ -5262,10 +5235,7 @@ projects:
   - name: stackforge/xstatic-font-awesome
     template:
       - name: merge-check
-    check:
-      - noop
-    gate:
-      - noop
+      - name: noop-jobs
 
   - name: stackforge/xstatic-hogan
     template:
@@ -5333,4 +5303,5 @@ projects:
 
   - name: stackforge/tuskar-ui-extras
     template:
+      - name: merge-check
       - name: noop-jobs