diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 8374b6aa6e..39dbfa43fd 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1727,9 +1727,11 @@
     github-org: openstack
     node: bare-precise
     tarball-site: tarballs.openstack.org
+    doc-publisher-site: docs.openstack.org
 
     jobs:
       - python-jobs
+      - openstack-publish-jobs
       - pypi-jobs
       - gate-{name}-tox-{envlist}:
           envlist: py26-sa7-mysql
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index a9daf7406b..c25e606102 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1125,23 +1125,17 @@ projects:
       - swift-merge-release-tags
 
   - name: openstack/taskflow
+    template:
+      - name: python-jobs
+      - name: openstack-server-publish-jobs
     check:
-      - gate-taskflow-pep8
-      - gate-taskflow-python26
-      - gate-taskflow-python27
       - gate-taskflow-python33
       - gate-taskflow-tox-py26-sa7-mysql
       - gate-taskflow-tox-py27-sa8-mysql
     gate:
-      - gate-taskflow-pep8
-      - gate-taskflow-python26
-      - gate-taskflow-python27
       - gate-taskflow-python33
       - gate-taskflow-tox-py26-sa7-mysql
       - gate-taskflow-tox-py27-sa8-mysql
-    post:
-      - taskflow-coverage
-      - taskflow-branch-tarball
     pre-release:
       - taskflow-tarball
     release: