diff --git a/puppet/services/cinder-backend-veritas-hyperscale.yaml b/puppet/services/cinder-backend-veritas-hyperscale.yaml
index 11ceb2fd35..4d142021a4 100644
--- a/puppet/services/cinder-backend-veritas-hyperscale.yaml
+++ b/puppet/services/cinder-backend-veritas-hyperscale.yaml
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Openstack Veritas HyperScale backend
diff --git a/puppet/services/ironic-inspector.yaml b/puppet/services/ironic-inspector.yaml
index 3ec75ac7b1..0cff07826a 100644
--- a/puppet/services/ironic-inspector.yaml
+++ b/puppet/services/ironic-inspector.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Ironic Inspector configured with Puppet (EXPERIMENTAL)
diff --git a/puppet/services/neutron-linuxbridge-agent.yaml b/puppet/services/neutron-linuxbridge-agent.yaml
index 5d7b99e787..d6ad3b0035 100644
--- a/puppet/services/neutron-linuxbridge-agent.yaml
+++ b/puppet/services/neutron-linuxbridge-agent.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Neutron Linuxbridge agent configured with Puppet.
diff --git a/puppet/services/nova-migration-target.yaml b/puppet/services/nova-migration-target.yaml
index e121d37a44..dcff1fdcb3 100644
--- a/puppet/services/nova-migration-target.yaml
+++ b/puppet/services/nova-migration-target.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Nova migration target configured with Puppet
diff --git a/puppet/services/pacemaker/ovn-dbs.yaml b/puppet/services/pacemaker/ovn-dbs.yaml
index 38039aa515..e6394e6c48 100644
--- a/puppet/services/pacemaker/ovn-dbs.yaml
+++ b/puppet/services/pacemaker/ovn-dbs.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OVN databases configured with puppet in HA mode
diff --git a/puppet/services/tuned.yaml b/puppet/services/tuned.yaml
index f1dec93177..cbebaff7cd 100644
--- a/puppet/services/tuned.yaml
+++ b/puppet/services/tuned.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Configure tuned
diff --git a/puppet/services/veritas-hyperscale-controller.yaml b/puppet/services/veritas-hyperscale-controller.yaml
index fe641ad633..33244b352d 100644
--- a/puppet/services/veritas-hyperscale-controller.yaml
+++ b/puppet/services/veritas-hyperscale-controller.yaml
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Openstack Veritas HyperScale backend