diff --git a/puppet/services/time/ntp.yaml b/deployment/time/ntp-baremetal-puppet.yaml
similarity index 100%
rename from puppet/services/time/ntp.yaml
rename to deployment/time/ntp-baremetal-puppet.yaml
diff --git a/puppet/services/time/ptp.yaml b/deployment/time/ptp-baremetal-puppet.yaml
similarity index 100%
rename from puppet/services/time/ptp.yaml
rename to deployment/time/ptp-baremetal-puppet.yaml
diff --git a/puppet/services/time/timezone.yaml b/deployment/time/timezone-baremetal-puppet.yaml
similarity index 100%
rename from puppet/services/time/timezone.yaml
rename to deployment/time/timezone-baremetal-puppet.yaml
diff --git a/environments/services/ptp.yaml b/environments/services/ptp.yaml
index 8fdbf2ae8e..d1b05eb4b1 100644
--- a/environments/services/ptp.yaml
+++ b/environments/services/ptp.yaml
@@ -3,7 +3,7 @@
 resource_registry:
   OS::TripleO::Services::Ntp: OS::Heat::None
   # FIXME(bogdando): switch it, once it is containerized
-  OS::TripleO::Services::Ptp: ../../puppet/services/time/ptp.yaml
+  OS::TripleO::Services::Ptp: ../../deployment/time/ptp-baremetal-puppet.yaml
   OS::TripleO::Services::Timesync: OS::TripleO::Services::Ptp
 
 parameter_defaults:
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 2524318b76..d4a28e2e09 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -215,7 +215,7 @@ resource_registry:
   OS::TripleO::Services::SwiftRingBuilder: docker/services/swift-ringbuilder.yaml
   OS::TripleO::Services::Snmp: deployment/snmp/snmp-baremetal-puppet.yaml
   OS::TripleO::Services::Tacker: OS::Heat::None
-  OS::TripleO::Services::Timezone: puppet/services/time/timezone.yaml
+  OS::TripleO::Services::Timezone: deployment/time/timezone-baremetal-puppet.yaml
   OS::TripleO::Services::CeilometerAgentCentral: docker/services/ceilometer-agent-central.yaml
   OS::TripleO::Services::CeilometerAgentIpmi: docker/services/ceilometer-agent-ipmi.yaml
   OS::TripleO::Services::CeilometerAgentNotification: docker/services/ceilometer-agent-notification.yaml
@@ -230,7 +230,7 @@ resource_registry:
 
   # Time sync services
   OS::TripleO::Services::Chrony: deployment/timesync/chrony-baremetal-ansible.yaml
-  OS::TripleO::Services::Ntp: puppet/services/time/ntp.yaml
+  OS::TripleO::Services::Ntp: deployment/time/ntp-baremetal-puppet.yaml
   OS::TripleO::Services::Ptp: OS::Heat::None
   OS::TripleO::Services::Timesync: OS::TripleO::Services::Chrony
 
diff --git a/sample-env-generator/composable-roles.yaml b/sample-env-generator/composable-roles.yaml
index 3ae6ba7e42..912a1e0352 100644
--- a/sample-env-generator/composable-roles.yaml
+++ b/sample-env-generator/composable-roles.yaml
@@ -22,7 +22,7 @@ environments:
           - ControllerCount
           - ComputeCount
           - CephStorageCount
-      puppet/services/time/ntp.yaml:
+      deployment/time/ntp-baremetal-puppet.yaml:
         parameters:
           - NtpServer
       sample-env-generator/composable-roles.yaml:
@@ -58,7 +58,7 @@ environments:
           - ControllerCount
           - ComputeCount
           - CephStorageCount
-      puppet/services/time/ntp.yaml:
+      deployment/time/ntp-baremetal-puppet.yaml:
         parameters:
           - NtpServer
       sample-env-generator/composable-roles.yaml:
@@ -93,7 +93,7 @@ environments:
           - CephStorageHostnameFormat
           - ComputeCount
           - CephStorageCount
-      puppet/services/time/ntp.yaml:
+      deployment/time/ntp-baremetal-puppet.yaml:
         parameters:
           - NtpServer
       sample-env-generator/composable-roles.yaml:
diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml
index 2479b69a9b..420753ea1a 100644
--- a/sample-env-generator/standalone.yaml
+++ b/sample-env-generator/standalone.yaml
@@ -28,7 +28,7 @@ environments:
       docker/services/swift-storage.yaml:
         parameters:
           - SwiftReplicas
-      puppet/services/time/ntp.yaml:
+      deployment/time/ntp-baremetal-puppet.yaml:
         parameters:
           - NtpServer
       puppet/services/tripleo-packages.yaml:
@@ -164,7 +164,7 @@ environments:
       docker/services/swift-storage.yaml:
         parameters:
           - SwiftReplicas
-      puppet/services/time/ntp.yaml:
+      deployment/time/ntp-baremetal-puppet.yaml:
         parameters:
           - NtpServer
       # TODO(aschultz): hack to pull in this config transport, not sure it is