diff --git a/playbooks/python/upload-pypi.yaml b/playbooks/python/upload-pypi.yaml
new file mode 100644
index 000000000..df035eabb
--- /dev/null
+++ b/playbooks/python/upload-pypi.yaml
@@ -0,0 +1,3 @@
+- hosts: all
+  roles:
+    - role: upload-pypi
diff --git a/zuul.yaml b/zuul.yaml
index b6ff80364..cd90ab55b 100644
--- a/zuul.yaml
+++ b/zuul.yaml
@@ -136,6 +136,16 @@
     run: playbooks/tox/tarball
     post-run: playbooks/python/tarball-post
 
+- job:
+    name: python-upload-pypi
+    parent: python-sdist
+    description: |
+      Generate a and upload a python source tarball and binary wheel
+
+      Requires a variable ``pypi_info`` be set which is a dict containing
+      at least a ``username`` and ``password`` attribute.
+    post-run: playbooks/python/upload-pypi
+
 - project:
     name: openstack-infra/zuul-jobs
     check: