diff --git a/jenkins/jobs/infra.yaml b/jenkins/jobs/infra.yaml
index afcb647b71..01d5f8afef 100644
--- a/jenkins/jobs/infra.yaml
+++ b/jenkins/jobs/infra.yaml
@@ -56,8 +56,8 @@
       - console-log
 
 # This is a non-standard docs job because it uses SCP instead of FTP
-- job:
-    name: ci-docs
+- job-template:
+    name: '{name}-ci-docs'
     node: 'bare-precise || bare-trusty'
 
     builders:
@@ -69,9 +69,10 @@
 
     publishers:
       - scp:
+          # publish to ci.openstack.org
           site: '173.203.107.207'
           files:
-            - target: 'ci'
+            - target: '{target}'
               source: 'doc/build/html/**/*'
               keep-hierarchy: true
       - console-log
diff --git a/jenkins/jobs/job-builder.yaml b/jenkins/jobs/job-builder.yaml
index 9f6961b64a..a23477269a 100644
--- a/jenkins/jobs/job-builder.yaml
+++ b/jenkins/jobs/job-builder.yaml
@@ -1,22 +1,3 @@
-# This is a non-standard docs job because it uses SCP instead of FTP
-- job:
-    name: jenkins-job-builder-docs
-    node: 'bare-precise || bare-trusty'
-
-    builders:
-      - revoke-sudo
-      - gerrit-git-prep
-      - docs
-
-    publishers:
-      - scp:
-          site: '173.203.107.207'
-          files:
-            - target: 'ci/jenkins-job-builder'
-              source: 'doc/build/html/**/*'
-              keep-hierarchy: true
-      - console-log
-
 - job:
     name: jenkins-job-builder-compare-xml
     node: 'bare-precise || bare-trusty'
diff --git a/jenkins/jobs/nodepool.yaml b/jenkins/jobs/nodepool.yaml
deleted file mode 100644
index 0c5b9a1b1a..0000000000
--- a/jenkins/jobs/nodepool.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# This is a non-standard docs job because it uses SCP instead of FTP
-- job:
-    name: nodepool-docs
-    node: 'bare-precise || bare-trusty'
-
-    builders:
-      - revoke-sudo
-      - gerrit-git-prep
-      - docs
-
-    publishers:
-      - scp:
-          site: '173.203.107.207'
-          files:
-            - target: 'ci/nodepool'
-              source: 'doc/build/html/**/*'
-              keep-hierarchy: true
-      - console-log
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index c4c0123a7d..a9fbb96546 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1896,6 +1896,8 @@
     jobs:
       - python-jobs
       - pypi-jobs
+      - '{name}-ci-docs':
+          target: 'ci/jenkins-job-builder'
 
 - project:
     name: nodepool
@@ -1905,7 +1907,8 @@
     jobs:
       - python-jobs
       - pypi-jobs
-
+      - '{name}-ci-docs':
+          target: 'ci/nodepool'
 
 - project:
     name: nose-html-output
@@ -2097,6 +2100,8 @@
             - precise
             - trusty
             - centos6
+      - '{name}-ci-docs':
+          target: 'ci'
 
 - project:
     name: vinz
@@ -2106,6 +2111,8 @@
     jobs:
       - python-jobs
       - pypi-jobs
+      - '{name}-ci-docs':
+          target: 'ci/vinz'
 
 - project:
     name: vinz-webclient
@@ -2142,6 +2149,8 @@
     jobs:
       - python-jobs
       - pypi-jobs
+      - '{name}-ci-docs':
+          target: 'ci/zuul'
 
 ########################################################################
 # Section: Stackforge projects
diff --git a/jenkins/jobs/vinz.yaml b/jenkins/jobs/vinz.yaml
deleted file mode 100644
index ebfbedc876..0000000000
--- a/jenkins/jobs/vinz.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# This is a non-standard docs job because it uses SCP instead of FTP
-- job:
-    name: vinz-docs
-    node: 'bare-precise || bare-trusty'
-
-    builders:
-      - revoke-sudo
-      - gerrit-git-prep
-      - docs
-
-    publishers:
-      - scp:
-          site: '173.203.107.207'
-          files:
-            - target: 'ci/vinz'
-              source: 'doc/build/html/**/*'
-              keep-hierarchy: true
-      - console-log
diff --git a/jenkins/jobs/zuul.yaml b/jenkins/jobs/zuul.yaml
index 81a79da18d..8e24c3d4ce 100644
--- a/jenkins/jobs/zuul.yaml
+++ b/jenkins/jobs/zuul.yaml
@@ -1,22 +1,3 @@
-# This is a non-standard docs job because it uses SCP instead of FTP
-- job:
-    name: zuul-docs
-    node: 'bare-precise || bare-trusty'
-
-    builders:
-      - revoke-sudo
-      - gerrit-git-prep
-      - docs
-
-    publishers:
-      - scp:
-          site: '173.203.107.207'
-          files:
-            - target: 'ci/zuul'
-              source: 'doc/build/html/**/*'
-              keep-hierarchy: true
-      - console-log
-
 - job:
     name: 'dev-zuul-coverage'
     node: 'bare-precise || bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 62e1b0527a..e0390081b2 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3336,7 +3336,7 @@ projects:
       - jenkins-job-builder-compare-xml
       - jenkins-job-builder-coverage
     post:
-      - jenkins-job-builder-docs
+      - jenkins-job-builder-ci-docs
       - jenkins-job-builder-coverage
 
   - name: openstack-infra/lodgeit
@@ -3355,7 +3355,7 @@ projects:
       - name: python-jobs
       - name: publish-to-pypi
     post:
-      - nodepool-docs
+      - nodepool-ci-docs
       - nodepool-coverage
 
   - name: openstack-infra/nose-html-output
@@ -3639,7 +3639,7 @@ projects:
       - gate-system-config-puppet-syntax
       - gate-ci-docs
     post:
-      - ci-docs
+      - system-config-ci-docs
     experimental:
       - experimental-swift-logs-system-config-pep8-centos6
 
@@ -3655,11 +3655,11 @@ projects:
       - name: publish-to-pypi
       - name: python-jobs
     post:
-      - vinz-docs
+      - vinz-ci-docs
     pre-release:
-      - vinz-docs
+      - vinz-ci-docs
     release:
-      - vinz-docs
+      - vinz-ci-docs
 
   - name: openstack-infra/vinz-webclient
     template:
@@ -3702,12 +3702,12 @@ projects:
     gate:
       - gate-zuul-python26
     post:
-      - zuul-docs
+      - zuul-ci-docs
       - zuul-coverage
     pre-release:
-      - zuul-docs
+      - zuul-ci-docs
     release:
-      - zuul-docs
+      - zuul-ci-docs
     periodic:
       - periodic-test