diff --git a/jenkins/jobs/macros.yaml b/jenkins/jobs/macros.yaml
index 69545d7849..e6055674ec 100644
--- a/jenkins/jobs/macros.yaml
+++ b/jenkins/jobs/macros.yaml
@@ -880,6 +880,16 @@
               keep-hierarchy: true
               copy-after-failure: true
 
+- publisher:
+    name: upload-releasenotes-draft
+    publishers:
+      - scp:
+          site: 'static.openstack.org'
+          files:
+            - target: 'docs-draft/$LOG_PATH'
+              source: 'releasenotes/build/html/**'
+              keep-hierarchy: true
+              copy-after-failure: true
 
 - publisher:
     name: upload-to-docs-site
diff --git a/jenkins/jobs/openstack-publish-jobs.yaml b/jenkins/jobs/openstack-publish-jobs.yaml
index f87470aa8f..0f6d2a9249 100644
--- a/jenkins/jobs/openstack-publish-jobs.yaml
+++ b/jenkins/jobs/openstack-publish-jobs.yaml
@@ -57,6 +57,20 @@
       - console-log
 
 
+- job-template:
+    name: 'gate-{name}-releasenotes'
+    node: 'bare-precise || bare-trusty'
+
+    builders:
+      - revoke-sudo
+      - tox:
+          envlist: 'releasenotes'
+
+    publishers:
+      - upload-releasenotes-draft
+      - zuul-swift-upload-console-log
+
+
 - job-group:
     name: openstack-publish-jobs
     jobs:
@@ -67,6 +81,5 @@
 - job-group:
     name: openstack-releasenotes-jobs
     jobs:
-      - 'gate-{name}-tox-{envlist}':
-          envlist: releasenotes
+      - 'gate-{name}-releasenotes'
       - '{name}-releasenotes'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 09650734f3..2f430dba05 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -465,7 +465,7 @@ project-templates:
 
   - name: release-notes-jobs
     check:
-      - 'gate-{name}-tox-releasenotes'
+      - 'gate-{name}-releasenotes'
     post:
       - '{name}-releasenotes'
 
@@ -2099,7 +2099,8 @@ jobs:
   - name: gate-tempest-dsvm-neutron-full-ssh
     voting: false
 
-  - name: ^gate-.*-tox-releasenotes$
+  - name: ^gate-.*-releasenotes$
+    success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/releasenotes/build/html/
     branch: ^(?!stable/(?:juno|kilo)).*$
     voting: false
     files: