diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 59f0f8c1..a13680df 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -108,6 +108,24 @@
       jobs:
         - publish-openstack-sphinx-docs-infra
 
+- project-template:
+    name: puppet-release-jobs
+    pre-release:
+      jobs:
+        - release-openstack-puppet
+        - announce-release:
+            dependencies:
+              - release-openstack-puppet
+    release:
+      jobs:
+        - release-openstack-puppet
+        - announce-release:
+            dependencies:
+              - release-openstack-puppet
+    post:
+      jobs:
+        - publish-openstack-puppet-branch-tarball
+
 - project-template:
     name: publish-to-pypi
     description: |
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index 967570d5..208f75be 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -463,30 +463,6 @@
         - legacy-puppet-openstack-libraries-puppet-unit-centos-7
         - legacy-puppet-openstack-libraries-puppet-beaker-rspec-centos-7
 
-# TODO(pabelanger): Move this to zuul.d/project-templates.yaml
-- project-template:
-    name: puppet-release-jobs
-    pre-release:
-      jobs:
-        - publish-openstack-python-tarball:
-            dependencies:
-              - publish-openstack-python-tarball
-        - announce-release:
-            dependencies:
-              - publish-openstack-python-tarball
-        - publish-openstack-python-tarball
-    release:
-      jobs:
-        - publish-openstack-python-tarball:
-            dependencies:
-              - publish-openstack-python-tarball
-        - announce-release:
-            dependencies:
-              - publish-openstack-python-tarball
-        - publish-openstack-python-tarball
-    post:
-      jobs:
-        - publish-openstack-puppet-branch-tarball
 
 - project-template:
     name: puppet-syntax