diff --git a/puppet/services/tripleo-packages.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
similarity index 100%
rename from puppet/services/tripleo-packages.yaml
rename to deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 2a48cd188b..8a82c1ca7a 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -277,8 +277,8 @@ resource_registry:
   OS::TripleO::Services::IronicPxe: OS::Heat::None
   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: deployment/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml
+  OS::TripleO::Services::TripleoPackages: deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
   OS::TripleO::Services::OpenStackClients: OS::Heat::None
   OS::TripleO::Services::OpenDaylightApi: OS::Heat::None
   OS::TripleO::Services::OpenDaylightOvs: OS::Heat::None
diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml
index ae5ac177e1..88a5a2cdce 100644
--- a/sample-env-generator/standalone.yaml
+++ b/sample-env-generator/standalone.yaml
@@ -31,7 +31,7 @@ environments:
       puppet/services/time/ntp.yaml:
         parameters:
           - NtpServer
-      puppet/services/tripleo-packages.yaml:
+      deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml:
         parameters:
           - EnablePackageInstall
       # TODO(aschultz): hack to pull in this config transport, not sure it is