diff --git a/puppet/services/tripleo-firewall.yaml b/deployment/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml
similarity index 100%
rename from puppet/services/tripleo-firewall.yaml
rename to deployment/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index ee895a21cb..84d0be18a5 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -278,7 +278,7 @@ resource_registry:
   OS::TripleO::Services::IronicNeutronAgent: OS::Heat::None
   OS::TripleO::Services::NovaIronic: OS::Heat::None
   OS::TripleO::Services::TripleoPackages: puppet/services/tripleo-packages.yaml
-  OS::TripleO::Services::TripleoFirewall: puppet/services/tripleo-firewall.yaml
+  OS::TripleO::Services::TripleoFirewall: deployment/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml
   OS::TripleO::Services::OpenStackClients: OS::Heat::None
   OS::TripleO::Services::OpenDaylightApi: OS::Heat::None
   OS::TripleO::Services::OpenDaylightOvs: OS::Heat::None