diff --git a/modules/jenkins_jobs/files/projects/openstack/python-cinderclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-cinderclient.yml
index 63ab477854..d0bd44eeb1 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-cinderclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-cinderclient.yml
@@ -10,3 +10,26 @@ values:
   tarball_project: 'cinder'
   doc_publisher_site: 'docs.openstack.org'
   node: 'precise'
+
+---
+# pypi-upload
+main:
+  name: 'python-cinderclient-pypi'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack'
+  project: 'python-cinderclient'
+  authenticatedBuild: 'false'
+  concurrent: 'true'
+
+triggers:
+  - zuul
+
+builders:
+  - gerrit_git_prep
+  - shell: tox -v -evenv python setup.py sdist upload
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'master'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-glanceclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-glanceclient.yml
index 501435b88f..c4df7f2226 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-glanceclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-glanceclient.yml
@@ -10,3 +10,26 @@ values:
   tarball_project: 'glance'
   doc_publisher_site: 'docs.openstack.org'
   node: 'precise'
+
+---
+# pypi-upload
+main:
+  name: 'python-glanceclient-pypi'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack'
+  project: 'python-glanceclient'
+  authenticatedBuild: 'false'
+  concurrent: 'true'
+
+triggers:
+  - zuul
+
+builders:
+  - gerrit_git_prep
+  - shell: tox -v -evenv python setup.py sdist upload
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'master'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-keystoneclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-keystoneclient.yml
index 7e8928bdfa..d072b4e2ff 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-keystoneclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-keystoneclient.yml
@@ -10,3 +10,26 @@ values:
   tarball_project: 'keystone'
   doc_publisher_site: 'docs.openstack.org'
   node: 'precise'
+
+---
+# pypi-upload
+main:
+  name: 'python-keystoneclient-pypi'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack'
+  project: 'python-keystoneclient'
+  authenticatedBuild: 'false'
+  concurrent: 'true'
+
+triggers:
+  - zuul
+
+builders:
+  - gerrit_git_prep
+  - shell: tox -v -evenv python setup.py sdist upload
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'master'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-novaclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-novaclient.yml
index f54f99000c..7cd1eab550 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-novaclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-novaclient.yml
@@ -10,3 +10,26 @@ values:
   tarball_project: 'nova'
   doc_publisher_site: 'docs.openstack.org'
   node: 'precise'
+
+---
+# pypi-upload
+main:
+  name: 'python-novaclient-pypi'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack'
+  project: 'python-novaclient'
+  authenticatedBuild: 'false'
+  concurrent: 'true'
+
+triggers:
+  - zuul
+
+builders:
+  - gerrit_git_prep
+  - shell: tox -v -evenv python setup.py sdist upload
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'master'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-openstackclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-openstackclient.yml
index 4b733f6346..6049accad8 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-openstackclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-openstackclient.yml
@@ -10,3 +10,26 @@ values:
   tarball_project: 'python-openstackclient'
   doc_publisher_site: 'docs.openstack.org'
   node: 'precise'
+
+---
+# pypi-upload
+main:
+  name: 'python-openstackclient-pypi'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack'
+  project: 'python-openstackclient'
+  authenticatedBuild: 'false'
+  concurrent: 'true'
+
+triggers:
+  - zuul
+
+builders:
+  - gerrit_git_prep
+  - shell: tox -v -evenv python setup.py sdist upload
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'master'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-quantumclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-quantumclient.yml
index 5ab962d5c0..480ccc71f4 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-quantumclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-quantumclient.yml
@@ -10,3 +10,26 @@ values:
   tarball_project: 'quantum'
   doc_publisher_site: 'docs.openstack.org'
   node: 'precise'
+
+---
+# pypi-upload
+main:
+  name: 'python-quantumclient-pypi'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack'
+  project: 'python-quantumclient'
+  authenticatedBuild: 'false'
+  concurrent: 'true'
+
+triggers:
+  - zuul
+
+builders:
+  - gerrit_git_prep
+  - shell: tox -v -evenv python setup.py sdist upload
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'master'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-swiftclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-swiftclient.yml
index 29db003820..446a096ae7 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-swiftclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-swiftclient.yml
@@ -10,3 +10,26 @@ values:
   tarball_project: 'swift'
   doc_publisher_site: 'docs.openstack.org'
   node: 'precise'
+
+---
+# pypi-upload
+main:
+  name: 'python-swiftclient-pypi'
+  review_site: 'review.openstack.org'
+  github_org: 'openstack'
+  project: 'python-swiftclient'
+  authenticatedBuild: 'false'
+  concurrent: 'true'
+
+triggers:
+  - zuul
+
+builders:
+  - gerrit_git_prep
+  - shell: tox -v -evenv python setup.py sdist upload
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'master'
diff --git a/modules/openstack-ci-config/files/zuul/layout.yaml b/modules/openstack-ci-config/files/zuul/layout.yaml
index e004443662..f09d8df0e9 100644
--- a/modules/openstack-ci-config/files/zuul/layout.yaml
+++ b/modules/openstack-ci-config/files/zuul/layout.yaml
@@ -28,6 +28,12 @@ queues:
       - event: ref-updated
         ref: ^(?!refs/).*$
 
+  - name: publish
+    manager: IndependentQueueManager
+    trigger:
+      - event: ref-updated
+        ref: ^refs/tags/.*$
+
   - name: silent
     manager: IndependentQueueManager
     trigger:
@@ -203,6 +209,8 @@ projects:
         - gate-python-cinderclient-python27
     post:
       - python-cinderclient-tarball
+    publish:
+      - python-cinderclient-pypi
     silent:
       - gate-tempest-devstack-vm
 
@@ -221,6 +229,8 @@ projects:
         - gate-integration-tests-devstack-vm
     post:
       - python-glanceclient-tarball
+    publish:
+      - python-glanceclient-pypi
     silent:
       - gate-tempest-devstack-vm
 
@@ -239,6 +249,8 @@ projects:
         - gate-integration-tests-devstack-vm
     post:
       - python-keystoneclient-tarball
+    publish:
+      - python-keystoneclient-pypi
     silent:
       - gate-tempest-devstack-vm
 
@@ -257,6 +269,8 @@ projects:
         - gate-integration-tests-devstack-vm
     post:
       - python-novaclient-tarball
+    publish:
+      - python-novaclient-pypi
     silent:
       - gate-tempest-devstack-vm
 
@@ -273,6 +287,8 @@ projects:
         - gate-python-openstackclient-python27
     post:
       - python-openstackclient-tarball
+    publish:
+      - python-openstackclient-pypi
 
   - name: openstack/python-quantumclient
     check:
@@ -289,6 +305,8 @@ projects:
         - gate-integration-tests-devstack-vm
     post:
       - python-quantumclient-tarball
+    publish:
+      - python-quantumclient-pypi
     silent:
       - gate-tempest-devstack-vm
 
@@ -305,6 +323,8 @@ projects:
         - gate-python-swiftclient-python27
     post:
       - python-swiftclient-tarball
+    publish:
+      - python-swiftclient-pypi
 
   - name: openstack-dev/devstack
     check: