diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
index 0bdeeabdf5..393bc02d51 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
@@ -1,29 +1,3 @@
-- job:
-    name: gate-openstack-manuals-operations-guide
-    project-type: maven
-    node: precise
-
-    prebuilders:
-      - gerrit-git-prep
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: org.openstack.docs
-        artifact-id: openstack-guide
-      root-pom: doc/openstack-ops/pom.xml
-      goals: 'clean generate-sources -B'
-
-    publishers:
-      - console-log
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'docs-draft/$LOG_PATH/ops/'
-              source: 'doc/openstack-ops/target/docbkx/webhelp/**'
-              keep-hierarchy: true
-              copy-after-failure: true
-
 # in zuul/layout.yaml specified to only run against stable/grizzly
 - job:
     name: gate-openstack-manuals-validate
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 3ce62189c4..a26224f0ee 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -297,6 +297,7 @@
 
     jobs:
       - compute-api-v2.0
+      - openstack-doc-jobs
 
 
 - project:
@@ -559,6 +560,7 @@
 
     jobs:
       - identity-api-v2.0
+      - openstack-doc-jobs
 
 
 - project:
@@ -569,6 +571,7 @@
     doc-publisher-site: docs.openstack.org
 
     jobs:
+      - openstack-doc-jobs
       - image-api-v1.1
 
 
@@ -606,6 +609,7 @@
 
     jobs:
       - network-api-v1
+      - openstack-doc-jobs
 
 
 - project:
@@ -666,6 +670,7 @@
 
     jobs:
       - object-api-v1.0
+      - openstack-doc-jobs
 
 
 - project:
@@ -1908,8 +1913,7 @@
     node: precise
 
     jobs:
-      - gate-{name}-tox-{envlist}:
-          envlist: checkniceness
+      - openstack-doc-jobs
 
 - project:
     name: manila
@@ -2056,6 +2060,7 @@
       - '{name}-tarball'
       - pypi-jobs
 
+
 - project:
     name: api-site
     github-org: openstack
@@ -2064,6 +2069,24 @@
     jobs:
       - openstack-doc-jobs
 
+
+- project:
+    name: database-api
+    github-org: openstack
+    node: precise
+
+    jobs:
+      - openstack-doc-jobs
+
+
+- project:
+    name: volume-api
+    github-org: openstack
+    node: precise
+
+    jobs:
+      - openstack-doc-jobs
+
 - project:
     name: python-openstacksdk
     github-org: stackforge
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 60788dadb6..f9d71b05c3 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -360,9 +360,7 @@ jobs:
     branch: ^(?!stable/grizzly).*$
   - name: gate-openstack-manuals-validate-build
     branch: ^(?!stable/grizzly).*$
-  - name: gate-operations-guide-tox-checkniceness
-    voting: false
-  - name: gate-api-site-tox-checkniceness
+  - name: ^gate-.*-tox-checkniceness$
     voting: false
 # Deprecated documentation targets:
   - name: openstack-block-storage-admin-old
@@ -1969,59 +1967,45 @@ projects:
 # Section: OpenStack API projects
 
   - name: openstack/compute-api
-    check:
-      - gate-noop
-    gate:
-      - gate-noop
+    template:
+      - name: openstack-doc-gate
     post:
       - compute-api-v2.0
       - compute-api-v2.0-wadl
 
   - name: openstack/database-api
-    check:
-      - gate-noop
-    gate:
-      - gate-noop
+    template:
+      - name: openstack-doc-gate
 
   - name: openstack/identity-api
-    check:
-      - gate-noop
-    gate:
-      - gate-noop
+    template:
+      - name: openstack-doc-gate
     post:
       - identity-api-v2.0
 
   - name: openstack/image-api
-    check:
-      - gate-noop
-    gate:
-      - gate-noop
+    template:
+      - name: openstack-doc-gate
     post:
       - image-api-v1.1
       - image-api-v2.0
 
   - name: openstack/netconn-api
-    check:
-      - gate-noop
-    gate:
-      - gate-noop
+    template:
+      - name: openstack-doc-gate
     post:
       - network-api-v1
       - network-api-v2
 
   - name: openstack/object-api
-    check:
-      - gate-noop
-    gate:
-      - gate-noop
+    template:
+      - name: openstack-doc-gate
     post:
       - object-api-v1.0
 
   - name: openstack/volume-api
-    check:
-      - gate-noop
-    gate:
-      - gate-noop
+    template:
+      - name: openstack-doc-gate
     post:
       - block-api-v2.0
 
@@ -2078,11 +2062,8 @@ projects:
       - manuals-propose-translation-update
 
   - name: openstack/operations-guide
-    check:
-      - gate-operations-guide-tox-checkniceness
-      - gate-openstack-manuals-operations-guide
-    gate:
-      - gate-openstack-manuals-operations-guide
+    template:
+      - name: openstack-doc-gate
     post:
       - openstack-operations-guide
       - openstack-operations-guide-ja