diff --git a/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml b/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml
new file mode 100644
index 0000000000..3f14c82a30
--- /dev/null
+++ b/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml
@@ -0,0 +1,19 @@
+# This is a non-standard docs job because it uses SCP instead of FTP
+- job:
+    name: storyboard-docs
+    node: precise
+
+    builders:
+      - gerrit-git-prep
+      - docs:
+          github-org: openstack-infra
+          project: storyboard
+
+    publishers:
+      - scp:
+          site: '173.203.107.207'
+          files:
+            - target: 'ci/storyboard'
+              source: 'doc/build/html/**/*'
+              keep-hierarchy: true
+      - console-log
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 36b170cf7b..81234590c5 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -462,6 +462,8 @@ jobs:
     voting: false
   - name: gate-storyboard-python26
     voting: false
+  - name: gate-storyboard-python33
+    voting: false
 # puppet-openstack targets
   - name: gate-puppet-vswitch-puppet-lint
     voting: false
@@ -2631,18 +2633,15 @@ projects:
           - post-mirror-python33
 
   - name: openstack-infra/storyboard
-    check:
-      - gate-storyboard-pep8
-      - gate-storyboard-python26
-      - gate-storyboard-python27
-    gate:
-      - gate-storyboard-pep8
-      - gate-storyboard-python27
+    template:
+      - name: python-jobs
     post:
-      - storyboard-branch-tarball
+      - storyboard-docs
     pre-release:
+      - storyboard-docs
       - storyboard-tarball
     release:
+      - storyboard-docs
       - storyboard-tarball:
         - storyboard-pypi-upload:
           - post-mirror-python26