diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 780262c948..e07070638d 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -480,8 +480,7 @@
     tarball-site: tarballs.openstack.org
 
     jobs:
-      - gate-{name}-python27
-      - gate-{name}-docs
+      - specs-jobs
 
 
 - project:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index a3dbb9d391..96f7c64075 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -390,10 +390,8 @@ project-templates:
   - name: specs-jobs
     check:
       - 'gate-{name}-docs'
-      - 'gate-{name}-python27'
     gate:
       - 'gate-{name}-docs'
-      - 'gate-{name}-python27'
     post:
       - '{name}-publish-specs'
 
@@ -760,10 +758,8 @@ projects:
       - barbican-tarball
 
   - name: openstack/barbican-specs
-    check:
-      - gate-barbican-specs-docs
-    gate:
-      - gate-barbican-specs-docs
+    template:
+      - name: specs-jobs
 
   - name: openstack/ceilometer
     template:
@@ -793,6 +789,10 @@ projects:
   - name: openstack/ceilometer-specs
     template:
       - name: specs-jobs
+    check:
+      - gate-ceilometer-specs-python27
+    gate:
+      - gate-ceilometer-specs-python27
 
   - name: openstack/cinder
     template:
@@ -819,12 +819,12 @@ projects:
       - cinder-merge-release-tags
 
   - name: openstack/cinder-specs
+    template:
+      - name: specs-jobs
     check:
       - gate-cinder-specs-python27
-      - gate-cinder-specs-docs
     gate:
       - gate-cinder-specs-python27
-      - gate-cinder-specs-docs
 
   - name: openstack/cliff
     template:
@@ -885,6 +885,10 @@ projects:
   - name: openstack/designate-specs
     template:
       - name: specs-jobs
+    check:
+      - gate-designate-specs-python27
+    gate:
+      - gate-designate-specs-python27
 
   - name: openstack/glance
     template:
@@ -913,10 +917,12 @@ projects:
       - glance-merge-release-tags
 
   - name: openstack/glance-specs
+    template:
+      - name: specs-jobs
     check:
-      - gate-glance-specs-docs
+      - gate-glance-specs-python27
     gate:
-      - gate-glance-specs-docs
+      - gate-glance-specs-python27
 
   - name: openstack/glance.store
     template:
@@ -966,10 +972,8 @@ projects:
       - heat-merge-release-tags
 
   - name: openstack/heat-specs
-    check:
-      - gate-heat-specs-docs
-    gate:
-      - gate-heat-specs-docs
+    template:
+      - name: specs-jobs
 
   - name: openstack/horizon
     template:
@@ -1020,6 +1024,10 @@ projects:
   - name: openstack/ironic-specs
     template:
       - name: specs-jobs
+    check:
+      - gate-ironic-specs-python27
+    gate:
+      - gate-ironic-specs-python27
 
   - name: openstack/keystone
     template:
@@ -1088,6 +1096,10 @@ projects:
   - name: openstack/marconi-specs
     template:
       - name: specs-jobs
+    check:
+      - gate-marconi-specs-python27
+    gate:
+      - gate-marconi-specs-python27
 
   - name: openstack/neutron
     template:
@@ -1123,6 +1135,10 @@ projects:
   - name: openstack/neutron-specs
     template:
       - name: specs-jobs
+    check:
+      - gate-neutron-specs-python27
+    gate:
+      - gate-neutron-specs-python27
 
   - name: openstack/nova
     template:
@@ -1159,6 +1175,10 @@ projects:
   - name: openstack/nova-specs
     template:
       - name: specs-jobs
+    check:
+      - gate-nova-specs-python27
+    gate:
+      - gate-nova-specs-python27
 
   - name: stackforge/nova-docker
     template:
@@ -1192,6 +1212,10 @@ projects:
   - name: openstack/sahara-specs
     template:
       - name: specs-jobs
+    check:
+      - gate-sahara-specs-python27
+    gate:
+      - gate-sahara-specs-python27
 
   - name: openstack/stevedore
     template:
@@ -1872,6 +1896,10 @@ projects:
   - name: openstack/oslo-specs
     template:
       - name: specs-jobs
+    check:
+      - gate-oslo-specs-python27
+    gate:
+      - gate-oslo-specs-python27
 
   - name: openstack/oslo.config
     template:
@@ -2160,10 +2188,8 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
 
   - name: openstack/qa-specs
-    check:
-      - gate-qa-specs-docs
-    gate:
-      - gate-qa-specs-docs
+    template:
+      - name: specs-jobs
 
   - name: openstack/tempest
     template:
@@ -2290,6 +2316,10 @@ projects:
   - name: openstack/tripleo-specs
     template:
       - name: specs-jobs
+    check:
+      - gate-tripleo-specs-python27
+    gate:
+      - gate-tripleo-specs-python27
 
   - name: openstack/trove-integration
     check:
@@ -2338,6 +2368,10 @@ projects:
   - name: openstack/keystone-specs
     template:
       - name: specs-jobs
+    check:
+      - gate-keystone-specs-python27
+    gate:
+      - gate-keystone-specs-python27
 
   - name: openstack/image-api
     template:
@@ -2358,10 +2392,8 @@ projects:
       - object-api-tox-doc-publishdocs
 
   - name: openstack/swift-specs
-    check:
-      - gate-swift-specs-docs
-    gate:
-      - gate-swift-specs-docs
+    template:
+      - name: specs-jobs
 
   - name: openstack/volume-api
     template:
@@ -2383,6 +2415,10 @@ projects:
   - name: openstack/docs-specs
     template:
       - name: specs-jobs
+    check:
+      - gate-docs-specs-python27
+    gate:
+      - gate-docs-specs-python27
 
   - name: openstack/openstack-manuals
     template:
@@ -2775,10 +2811,8 @@ projects:
       - noop
 
   - name: openstack-infra/infra-specs
-    check:
-      - gate-infra-specs-docs
-    gate:
-      - gate-infra-specs-docs
+    template:
+      - name: specs-jobs
 
   - name: openstack-infra/groups-static-pages
     check: