diff --git a/ci/environments/scenario006-multinode.yaml b/ci/environments/scenario006-multinode.yaml
index 3f1afea0f5..8109d58b91 100644
--- a/ci/environments/scenario006-multinode.yaml
+++ b/ci/environments/scenario006-multinode.yaml
@@ -26,7 +26,6 @@ resource_registry:
   OS::TripleO::Services::NovaScheduler: OS::Heat::None
   OS::TripleO::Services::NovaCompute: OS::Heat::None
   OS::TripleO::Services::NovaLibvirt: OS::Heat::None
-  OS::TripleO::Services::Docker: ../../puppet/services/docker.yaml
 
 
 
diff --git a/puppet/services/docker.yaml b/deployment/docker/docker-baremetal-ansible.yaml
similarity index 100%
rename from puppet/services/docker.yaml
rename to deployment/docker/docker-baremetal-ansible.yaml
diff --git a/puppet/services/docker-registry.yaml b/deployment/docker/docker-registry-baremetal-ansible.yaml
similarity index 100%
rename from puppet/services/docker-registry.yaml
rename to deployment/docker/docker-registry-baremetal-ansible.yaml
diff --git a/environments/docker-uc-light.yaml b/environments/docker-uc-light.yaml
index f1edd30069..094427f71a 100644
--- a/environments/docker-uc-light.yaml
+++ b/environments/docker-uc-light.yaml
@@ -1,6 +1,6 @@
 # A lightweight UC for pre-provisioned deployed servers
 resource_registry:
-  OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
+  OS::TripleO::Services::Docker: ../deployment/docker/docker-baremetal-ansible.yaml
   # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
   # FIXME(bogdando): can not be switched yet due to puppet-base issues
   # see https://review.openstack.org/#/c/563443
diff --git a/environments/kubernetes.yaml b/environments/kubernetes.yaml
index ea3b19947c..34568bb721 100644
--- a/environments/kubernetes.yaml
+++ b/environments/kubernetes.yaml
@@ -1,4 +1,4 @@
 resource_registry:
-  OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
+  OS::TripleO::Services::Docker: ../deployment/docker/docker-baremetal-ansible.yaml
   OS::TripleO::Services::Kubernetes::Worker: ../extraconfig/services/kubernetes-worker.yaml
   OS::TripleO::Services::Kubernetes::Master: ../extraconfig/services/kubernetes-master.yaml
diff --git a/environments/openshift.yaml b/environments/openshift.yaml
index 54722e3f1a..c654ecce85 100644
--- a/environments/openshift.yaml
+++ b/environments/openshift.yaml
@@ -1,5 +1,5 @@
 resource_registry:
-  OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
+  OS::TripleO::Services::Docker: ../deployment/docker/docker-baremetal-ansible.yaml
   OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml
   OS::TripleO::Services::Keepalived: ../deployment/keepalived/keepalived-container-puppet.yaml
   OS::TripleO::Services::OpenShift::Infra: ../extraconfig/services/openshift-infra.yaml
diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml
index 3bb7e8b9b6..f1712eb1fa 100644
--- a/environments/standalone/standalone-tripleo.yaml
+++ b/environments/standalone/standalone-tripleo.yaml
@@ -77,7 +77,7 @@ resource_registry:
   OS::TripleO::Services::DesignateProducer: OS::Heat::None
   OS::TripleO::Services::DesignateSink: OS::Heat::None
   OS::TripleO::Services::DesignateWorker: OS::Heat::None
-  OS::TripleO::Services::DockerRegistry: ../../puppet/services/docker-registry.yaml
+  OS::TripleO::Services::DockerRegistry: ../../deployment/docker/docker-registry-baremetal-ansible.yaml
   OS::TripleO::Services::GnocchiApi: OS::Heat::None
   OS::TripleO::Services::GnocchiMetricd: OS::Heat::None
   OS::TripleO::Services::GnocchiStatsd: OS::Heat::None
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index 0d4e307576..654aab5e55 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -3,7 +3,7 @@ resource_registry:
   OS::TripleO::Network::Ports::ControlPlaneVipPort: ../deployed-server/deployed-neutron-port.yaml
   OS::TripleO::Undercloud::Net::SoftwareConfig: ../net-config-undercloud.yaml
   OS::TripleO::NodeExtraConfigPost: ../extraconfig/post_deploy/undercloud_post.yaml
-  OS::TripleO::Services::DockerRegistry: ../puppet/services/docker-registry.yaml
+  OS::TripleO::Services::DockerRegistry: ../deployment/docker/docker-registry-baremetal-ansible.yaml
   OS::TripleO::Services::ContainerImagePrepare: ../puppet/services/container-image-prepare.yaml
   # Allows us to control the external VIP for Undercloud SSL
   OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external_from_pool.yaml
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index a22003cd9f..a739328873 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -310,7 +310,7 @@ resource_registry:
   OS::TripleO::Services::Vpp: OS::Heat::None
   OS::TripleO::Services::NeutronVppAgent: OS::Heat::None
   OS::TripleO::Services::Podman: OS::Heat::None
-  OS::TripleO::Services::Docker: puppet/services/docker.yaml
+  OS::TripleO::Services::Docker: deployment/docker/docker-baremetal-ansible.yaml
   OS::TripleO::Services::DockerRegistry: OS::Heat::None
   OS::TripleO::Services::ContainerImagePrepare: puppet/services/container-image-prepare.yaml
   OS::TripleO::Services::CertmongerUser: puppet/services/certmonger-user.yaml
diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml
index 420753ea1a..2ee69738eb 100644
--- a/sample-env-generator/standalone.yaml
+++ b/sample-env-generator/standalone.yaml
@@ -65,8 +65,8 @@ environments:
 
       # Activate container image prepare
       OS::TripleO::Services::ContainerImagePrepare: ../../puppet/services/container-image-prepare.yaml
-      OS::TripleO::Services::DockerRegistry: ../../puppet/services/docker-registry.yaml
       OS::TripleO::Services::Podman: ../../deployment/podman/podman-baremetal-ansible.yaml
+      OS::TripleO::Services::DockerRegistry: ../../deployment/docker/docker-registry-baremetal-ansible.yaml
 
       # Disable non-openstack services that are enabled by default
       OS::TripleO::Services::HAproxy: OS::Heat::None