diff --git a/docker/services/tempest.yaml b/deployment/undercloud/tempest-container-puppet.yaml
similarity index 100%
rename from docker/services/tempest.yaml
rename to deployment/undercloud/tempest-container-puppet.yaml
diff --git a/environments/enable_tempest.yaml b/environments/enable_tempest.yaml
index 890ca22122..aac8d49914 100644
--- a/environments/enable_tempest.yaml
+++ b/environments/enable_tempest.yaml
@@ -1,2 +1,2 @@
 resource_registry:
-  OS::TripleO::Services::Tempest: ../docker/services/tempest.yaml
+  OS::TripleO::Services::Tempest: ../deployment/undercloud/tempest-container-puppet.yaml
diff --git a/environments/services/tempest.yaml b/environments/services/tempest.yaml
index 7e1efbe99f..ca5341165b 100644
--- a/environments/services/tempest.yaml
+++ b/environments/services/tempest.yaml
@@ -1,2 +1,2 @@
 resource_registry:
-  OS::TripleO::Services::Tempest: ../../docker/services/tempest.yaml
+  OS::TripleO::Services::Tempest: ../../deployment/undercloud/tempest-container-puppet.yaml