diff --git a/playbooks/puppet-branch-tarball/post.yaml b/playbooks/puppet-branch-tarball/post.yaml
deleted file mode 100644
index fba32b5f9a..0000000000
--- a/playbooks/puppet-branch-tarball/post.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-- hosts: all
-  roles:
-    - fetch-puppet-module-output
-
-  pre_tasks:
-    - name: Rename files to branch specific name
-      shell: "mv *.tar.gz {{ zuul.project.short_name }}-{{ zuul.branch | replace('/', '-') }}.tar.gz"
-      args:
-        chdir: "{{ zuul.project.src_dir }}/pkg"
diff --git a/playbooks/python-branch-tarball/post.yaml b/playbooks/python-branch-tarball/post.yaml
new file mode 100644
index 0000000000..d7f508c960
--- /dev/null
+++ b/playbooks/python-branch-tarball/post.yaml
@@ -0,0 +1,15 @@
+- hosts: all
+  roles:
+    - fetch-tox-output
+    - fetch-python-sdist-output
+
+  pre_tasks:
+    # NOTE(pabelanger): This need to run before fetch-python-sdist-output to
+    # properly rename wheels and tarballs.
+    - name: Rename files to branch specific name
+      shell: "mv *.{{ item }} {{ zuul.project.short_name }}-{{ zuul.branch | replace('/', '-') }}.{{ item }}"
+      args:
+        chdir: "src/{{ zuul.project.canonical_name }}/dist"
+      with_items:
+        - "tar.gz"
+        - "whl"