diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
index 98f42dd08e..ff43f886b8 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
@@ -1,14 +1,3 @@
-- job-template:
-    name: gate-openstack-manuals-validate-{check}
-    node: precise
-
-    builders:
-      - gerrit-git-prep
-      - shell: "./tools/test.py --check-{check}"
-
-    publishers:
-      - console-log
-
 - job-template:
     name: 'openstack-{manual}'
     project-type: maven
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 2bec004ba3..543eb68b56 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1831,12 +1831,9 @@
 
 
 - project:
-    name: manuals
-    check:
-       - niceness
-       - syntax
-       - deletions
-       - build
+    name: openstack-manuals
+    github-org: openstack
+    node: precise
 
     manual:
       - admin-guide-cloud
@@ -1859,7 +1856,7 @@
         - ja
 
     jobs:
-      - gate-openstack-manuals-validate-{check}
+      - openstack-doc-jobs
 
       - 'openstack-{manual}'
 
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index b70a570af4..4def415226 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -352,14 +352,14 @@ jobs:
     branch: ^(?!stable/grizzly).*$
   - name: openstack-install-deploy-guide-ubuntu
     branch: ^(?!stable/grizzly).*$
-  - name: gate-openstack-manuals-validate-niceness
+  - name: gate-openstack-manuals-tox-checkniceness
     branch: ^(?!stable/grizzly).*$
     voting: false
-  - name: gate-openstack-manuals-validate-syntax
+  - name: gate-openstack-manuals-tox-checksyntax
     branch: ^(?!stable/grizzly).*$
-  - name: gate-openstack-manuals-validate-deletions
+  - name: gate-openstack-manuals-tox-checkdeletions
     branch: ^(?!stable/grizzly).*$
-  - name: gate-openstack-manuals-validate-build
+  - name: gate-openstack-manuals-tox-checkbuild
     branch: ^(?!stable/grizzly).*$
   - name: ^gate-.*-tox-checkniceness$
     voting: false
@@ -2081,16 +2081,11 @@ projects:
       - manuals-propose-translation-update
 
   - name: openstack/openstack-manuals
+    template:
+      - name: openstack-doc-gate
     check:
-      - gate-openstack-manuals-validate-niceness
-      - gate-openstack-manuals-validate-syntax
-      - gate-openstack-manuals-validate-deletions
-      - gate-openstack-manuals-validate-build
       - gate-openstack-manuals-validate
     gate:
-      - gate-openstack-manuals-validate-syntax
-      - gate-openstack-manuals-validate-deletions
-      - gate-openstack-manuals-validate-build
       - gate-openstack-manuals-validate
     post:
       - openstack-admin-guide-cloud