diff --git a/playbooks/puppet-tarball/post.yaml b/playbooks/puppet-tarball/post.yaml
new file mode 100644
index 0000000000..87e91db35f
--- /dev/null
+++ b/playbooks/puppet-tarball/post.yaml
@@ -0,0 +1,15 @@
+- hosts: all
+  roles:
+    - fetch-puppet-module-output
+
+  pre_tasks:
+    # NOTE(pabelanger): Here we are converting openstack-neutron-8.0.0.tar.gz to
+    # puppet-neutron-8.0.0.tar.gz.
+    - name: Convert filename to puppet prefix
+      shell: "find . -name openstack-*.tar.gz | sed -e 'p;s/openstack-/puppet-/' | xargs -n2 mv"
+      args:
+        chdir: "{{ zuul.project.src_dir }}/pkg"
+
+- hosts: localhost
+  roles:
+    - sign-artifacts
diff --git a/playbooks/puppet-branch-tarball/pre.yaml b/playbooks/puppet-tarball/pre.yaml
similarity index 100%
rename from playbooks/puppet-branch-tarball/pre.yaml
rename to playbooks/puppet-tarball/pre.yaml
diff --git a/playbooks/puppet-branch-tarball/run.yaml b/playbooks/puppet-tarball/run.yaml
similarity index 100%
rename from playbooks/puppet-branch-tarball/run.yaml
rename to playbooks/puppet-tarball/run.yaml
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 2e8aa4c1ac..9629974658 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -118,6 +118,17 @@
       - secret: site_tarballs
         name: fileserver
 
+- job:
+    name: release-openstack-puppet
+    parent: publish-openstack-artifacts
+    description: |
+      Sign and release puppet tarballs to tarballs.o.o.
+    pre-run: playbooks/puppet-tarball/pre
+    run: playbooks/puppet-tarball/run
+    post-run: playbooks/puppet-tarball/post
+    secrets:
+      - gpg_key
+
 - job:
     name: release-openstack-python-without-pypi
     parent: publish-openstack-artifacts
@@ -354,8 +365,8 @@
     parent: publish-openstack-artifacts
     description: |
       Publish the results of the puppet-tarball job to tarballs.openstack.org.
-    pre-run: playbooks/puppet-branch-tarball/pre
-    run: playbooks/puppet-branch-tarball/run
+    pre-run: playbooks/puppet-tarball/pre
+    run: playbooks/puppet-tarball/run
     post-run: playbooks/puppet-branch-tarball/post
 
 - job: