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 4ec86beebd..68a628ca99 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2344,9 +2344,11 @@
     github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
+    doc-publisher-site: docs.openstack.org
 
     jobs:
       - python-jobs
+      - openstack-publish-jobs
       - translation-jobs
 
 - project:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 9964a06ae8..18a8351ffc 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -720,19 +720,17 @@ projects:
 
   - name: openstack/barbican
     template:
+      - name: python-jobs
       - name: translation-jobs
+      - name: openstack-server-publish-jobs
     check:
-      - gate-barbican-pep8
-      - gate-barbican-python27
-      - gate-barbican-python26
       - gate-barbican-devstack-dsvm
     gate:
-      - gate-barbican-pep8
-      - gate-barbican-python27
-      - gate-barbican-python26
       - gate-barbican-devstack-dsvm
-    post:
-      - barbican-branch-tarball
+    pre-release:
+      - barbican-tarball
+    release:
+      - barbican-tarball
 
   - name: openstack/barbican-specs
     check: