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 922ac2bd2a..a2b4ebf574 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -214,10 +214,12 @@
     github-org: openstack
     node: bare-precise
     tarball-site: tarballs.openstack.org
+    doc-publisher-site: docs.openstack.org
 
     jobs:
       - python-jobs
       - pypi-jobs
+      - openstack-publish-jobs
 
 - project:
     name: savanna-dashboard
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 38faf1183f..1a31dd64d5 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1451,27 +1451,20 @@ projects:
           - post-mirror-python27
           - post-mirror-python33
 
-# TODO: add docs
   - name: openstack/python-savannaclient
+    template:
+      - name: python-jobs
+      - name: openstack-server-publish-jobs
     check:
-      - gate-python-savannaclient-pep8
-      - gate-python-savannaclient-python26
-      - gate-python-savannaclient-python27
       - gate-python-savannaclient-requirements
       - check-tempest-dsvm-savanna-full
       - check-tempest-dsvm-savanna-postgres
       - check-tempest-dsvm-savanna-neutron
     gate:
-      - gate-python-savannaclient-pep8
-      - gate-python-savannaclient-python26
-      - gate-python-savannaclient-python27
       - gate-python-savannaclient-requirements
       - gate-tempest-dsvm-savanna-full
       - gate-tempest-dsvm-savanna-postgres
       - gate-tempest-dsvm-savanna-neutron
-    post:
-      - python-savannaclient-branch-tarball
-      - python-savannaclient-coverage
     pre-release:
        - python-savannaclient-tarball
     release: