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 68f142a620..f14902fd00 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2208,6 +2208,7 @@
 
     jobs:
       - python-jobs
+      - pypi-jobs
 
 - project:
     name: heat-translator
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 0f76c02079..d0e0236dba 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -4300,23 +4300,22 @@ projects:
 
   - name: stackforge/python-solumclient
     template:
+      - name: python-jobs
       - name: check-requirements
     check:
-      - gate-python-solumclient-pep8
-      - gate-python-solumclient-python26
-      - gate-python-solumclient-python27
       - gate-python-solumclient-python33
       - gate-python-solumclient-pypy
-      - gate-python-solumclient-docs
     gate:
-      - gate-python-solumclient-pep8
-      - gate-python-solumclient-python26
-      - gate-python-solumclient-python27
       - gate-python-solumclient-python33
       - gate-python-solumclient-pypy
-      - gate-python-solumclient-docs
-    post:
-      - python-solumclient-coverage
+    pre-release:
+      - python-solumclient-tarball
+    release:
+      - python-solumclient-tarball:
+        - python-solumclient-pypi-upload:
+          - post-mirror-python26
+          - post-mirror-python27
+          - post-mirror-python33
 
   - name: stackforge/rally
     template:
@@ -4373,26 +4372,22 @@ projects:
 
   - name: stackforge/solum
     template:
+      - name: python-jobs
       - name: check-requirements
     check:
-      - gate-solum-pep8
-      - gate-solum-python26
-      - gate-solum-python27
       - gate-solum-python33
       - gate-solum-pypy
-      - gate-solum-docs
       - gate-solum-devstack-dsvm
     gate:
-      - gate-solum-pep8
-      - gate-solum-python26
-      - gate-solum-python27
       - gate-solum-python33
       - gate-solum-pypy
-      - gate-solum-docs
       - gate-solum-devstack-dsvm
     post:
-      - solum-coverage
       - hook-solum-rtfd
+    pre-release:
+      - solum-tarball
+    release:
+      - solum-tarball
 
   - name: stackforge/sphinxcontrib-docbookrestapi
     check: