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 9677b19c68..7a8386949f 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -332,3 +332,25 @@
               source: 'doc/build/html/**'
               keep-hierarchy: true
               copy-after-failure: true
+
+- publisher:
+    name: upload-docs-draft
+    publishers:
+      - scp:
+          site: 'static.openstack.org'
+          files:
+            - target: 'docs-draft/$LOG_PATH/'
+              source: 'publish-docs/**'
+              keep-hierarchy: true
+              copy-after-failure: true
+
+- publisher:
+    name: upload-doc-build-results
+    publishers:
+      - scp:
+          site: 'static.openstack.org'
+          files:
+            - target: 'logs/$LOG_PATH'
+              source: 'build-*.log.gz'
+              keep-hierarchy: false
+              copy-after-failure: true
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 a94a812b32..7ffe1e9997 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
@@ -189,6 +189,30 @@
           target: ''
           remove-prefix: 'doc/src/docbkx/{install}/target/docbkx/webhelp/'
 
+- job-template:
+    name: 'gate-{name}-tox-doc-publish-{envlist}'
+
+    wrappers:
+      - timeout:
+          timeout: 40
+          fail: true
+      - timestamps
+
+    builders:
+      - gerrit-git-prep
+      - tox:
+          envlist: '{envlist}'
+          github-org: '{github-org}'
+          project: '{name}'
+      - assert-no-extra-files
+
+    publishers:
+      - console-log
+      - upload-docs-draft
+      - upload-doc-build-results
+
+    node: '{node}'
+
 - job-group:
     name: openstack-doc-jobs
     jobs:
@@ -198,5 +222,5 @@
           envlist: checksyntax
       - gate-{name}-tox-{envlist}:
           envlist: checkdeletions
-      - gate-{name}-tox-{envlist}:
+      - gate-{name}-tox-doc-publish-{envlist}:
           envlist: checkbuild
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index d9aa3fd664..08b6466c71 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -191,11 +191,11 @@ project-templates:
       - gate-{name}-tox-checkniceness
       - gate-{name}-tox-checksyntax
       - gate-{name}-tox-checkdeletions
-      - gate-{name}-tox-checkbuild
+      - gate-{name}-tox-doc-publish-checkbuild
     gate:
       - gate-{name}-tox-checksyntax
       - gate-{name}-tox-checkdeletions
-      - gate-{name}-tox-checkbuild
+      - gate-{name}-tox-doc-publish-checkbuild
 
 
 jobs:
@@ -368,7 +368,7 @@ jobs:
     branch: ^(?!stable/grizzly).*$
   - name: gate-openstack-manuals-tox-checkdeletions
     branch: ^(?!stable/grizzly).*$
-  - name: gate-openstack-manuals-tox-checkbuild
+  - name: gate-openstack-manuals-tox-doc-publish-checkbuild
     branch: ^(?!stable/grizzly).*$
   - name: ^gate-.*-tox-checkniceness$
     voting: false