diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml
index a1308a641b..6ffb92bb4b 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@@ -167,7 +167,7 @@ resources:
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
diff --git a/puppet/services/nova-base.yaml b/deployment/nova/nova-base-puppet.yaml
similarity index 100%
rename from puppet/services/nova-base.yaml
rename to deployment/nova/nova-base-puppet.yaml
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index 5deec22d41..edb1bf2982 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -278,7 +278,7 @@ resources:
       NovaServiceName: 'compute'
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml
index a5325dbb71..b5b22e637c 100644
--- a/deployment/nova/nova-conductor-container-puppet.yaml
+++ b/deployment/nova/nova-conductor-container-puppet.yaml
@@ -85,7 +85,7 @@ resources:
       NovaServiceName: 'conductor'
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
diff --git a/deployment/nova/nova-consoleauth-container-puppet.yaml b/deployment/nova/nova-consoleauth-container-puppet.yaml
index 5b6b225053..4e42dda60c 100644
--- a/deployment/nova/nova-consoleauth-container-puppet.yaml
+++ b/deployment/nova/nova-consoleauth-container-puppet.yaml
@@ -68,7 +68,7 @@ resources:
       NovaServiceName: 'consoleauth'
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml
index 8ab901ad4c..394b6f99a3 100644
--- a/deployment/nova/nova-ironic-container-puppet.yaml
+++ b/deployment/nova/nova-ironic-container-puppet.yaml
@@ -64,7 +64,7 @@ resources:
       RoleParameters: {get_param: RoleParameters}
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml
index 84bff2a324..ff6c4c5911 100644
--- a/deployment/nova/nova-libvirt-container-puppet.yaml
+++ b/deployment/nova/nova-libvirt-container-puppet.yaml
@@ -301,7 +301,7 @@ resources:
     type: OS::TripleO::Services::Logging::NovaLibvirt
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml
index a5b03f3892..080a7192a7 100644
--- a/deployment/nova/nova-metadata-container-puppet.yaml
+++ b/deployment/nova/nova-metadata-container-puppet.yaml
@@ -97,7 +97,7 @@ resources:
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
diff --git a/deployment/nova/nova-placement-container-puppet.yaml b/deployment/nova/nova-placement-container-puppet.yaml
index 4ceafde53e..56ccd3fb3e 100644
--- a/deployment/nova/nova-placement-container-puppet.yaml
+++ b/deployment/nova/nova-placement-container-puppet.yaml
@@ -92,7 +92,7 @@ resources:
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml
index 48eb1deb6e..3396a1c7d5 100644
--- a/deployment/nova/nova-scheduler-container-puppet.yaml
+++ b/deployment/nova/nova-scheduler-container-puppet.yaml
@@ -98,7 +98,7 @@ resources:
       NovaServiceName: 'scheduler'
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml
index 781af29998..e7f1f92af4 100644
--- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml
+++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml
@@ -113,7 +113,7 @@ resources:
       NovaServiceName: 'vncproxy'
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml
index 8058793aaf..1d2785e5b3 100644
--- a/sample-env-generator/ssl.yaml
+++ b/sample-env-generator/ssl.yaml
@@ -34,7 +34,7 @@ environments:
       puppet/all-nodes-config.yaml:
         parameters:
           - EnableInternalTLS
-      puppet/services/nova-base.yaml:
+      deployment/nova/nova-base-puppet.yaml:
         parameters:
           - RpcUseSSL
       deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml: