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 2f2e2569bc..676dda9e2c 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2391,6 +2391,7 @@
 
     jobs:
       - python-jobs
+      - openstack-publish-jobs
       - translation-jobs
       - openstack-publish-jobs
 
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 6d76fde8c9..f7da7e1f21 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -739,20 +739,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: