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 70c866dba1..68f142a620 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1861,9 +1861,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
 
 - project:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 726ae6a80d..0f76c02079 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1001,16 +1001,9 @@ projects:
       - name: check-requirements
 
   - name: openstack/pycadf
-    check:
-      - gate-pycadf-pep8
-      - gate-pycadf-python26
-      - gate-pycadf-python27
-    gate:
-      - gate-pycadf-pep8
-      - gate-pycadf-python26
-      - gate-pycadf-python27
-    post:
-      - pycadf-branch-tarball
+    template:
+      - name: python-jobs
+      - name: openstack-server-publish-jobs
     pre-release:
       - pycadf-tarball
     release: