diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index b41d3beaa0..fcd66ce5b9 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -330,3 +330,14 @@
               source: '**/*subunit_log.txt.gz'
               keep-hierarchy: false
               copy-after-failure: true
+
+- publisher:
+    name: upload-sphinx-draft
+    publishers:
+      - scp:
+          site: 'static.openstack.org'
+          files:
+            - target: 'docs-draft/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER/'
+              source: 'doc/build/html/**'
+              keep-hierarchy: true
+              copy-after-failure: true
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml
index 7c3f5fd6f3..20bbdc0771 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml
@@ -41,3 +41,18 @@
               source: 'doc/build/html/**/*'
               keep-hierarchy: true
       - console-log
+
+
+- job:
+    name: gate-ci-docs
+    node: precise
+
+    builders:
+      - gerrit-git-prep
+      - docs:
+          github-org: openstack-infra
+          project: config
+
+    publishers:
+      - console-log
+      - upload-sphinx-draft
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
index cd76e5ccf4..ffc44f6e27 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
@@ -111,13 +111,7 @@
 
     publishers:
       - console-log
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'docs-draft/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER/'
-              source: 'doc/build/html/**'
-              keep-hierarchy: true
-              copy-after-failure: true
+      - upload-sphinx-draft
 
     node: '{node}'
 
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 0715a3a955..aa805752c6 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -319,6 +319,7 @@ projects:
       - gate-config-puppet-lint
       - gate-config-puppet-syntax
       - gate-config-pyflakes
+      - gate-ci-docs
     gate:
       - gate-config-layout
       - gate-config-puppet-lint