diff --git a/playbooks/puppet-branch-tarball/post.yaml b/playbooks/puppet-branch-tarball/post.yaml
new file mode 100644
index 00000000..fba32b5f
--- /dev/null
+++ b/playbooks/puppet-branch-tarball/post.yaml
@@ -0,0 +1,9 @@
+- 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/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index bd25a6e1..37fed0a9 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -371,6 +371,15 @@
     pre-run: playbooks/puppet-tarball/pre.yaml
     run: playbooks/puppet-tarball/run.yaml
 
+- job:
+    name: publish-openstack-puppet-branch-tarball
+    parent: publish-openstack-artifacts
+    description: |
+      Publish the results of the puppet-tarball job to tarballs.openstack.org.
+    pre-run: playbooks/puppet-tarball/pre.yaml
+    run: playbooks/puppet-tarball/run.yaml
+    post-run: playbooks/puppet-branch-tarball/post.yaml
+
 - job:
     name: publish-openstack-python-tarball
     parent: publish-openstack-artifacts