diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml
index 0e6e0537b2..e585c4cccf 100644
--- a/ci/environments/scenario004-standalone.yaml
+++ b/ci/environments/scenario004-standalone.yaml
@@ -4,6 +4,7 @@ resource_registry:
   OS::TripleO::Services::CinderVolume: OS::Heat::None
   OS::TripleO::Services::Redis: OS::Heat::None
   OS::TripleO::Services::Horizon: OS::Heat::None
+  OS::TripleO::Services::Docker: ../../deployment/deprecated/docker/docker-baremetal-ansible.yaml
   OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
   OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
   OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
diff --git a/ci/environments/scenario012-standalone.yaml b/ci/environments/scenario012-standalone.yaml
index 7099c5d41a..8b457f0abb 100644
--- a/ci/environments/scenario012-standalone.yaml
+++ b/ci/environments/scenario012-standalone.yaml
@@ -1,6 +1,7 @@
 resource_registry:
   OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
   OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
+  OS::TripleO::Services::Docker: ../../deployment/deprecated/docker/docker-baremetal-ansible.yaml
   OS::TripleO::Services::NovaIronic: ../../deployment/nova/nova-ironic-container-puppet.yaml
   OS::TripleO::Services::IronicApi: ../../deployment/ironic/ironic-api-container-puppet.yaml
   OS::TripleO::Services::IronicConductor: ../../deployment/ironic/ironic-conductor-container-puppet.yaml
diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml
index 560fa8ca54..5ce6838bc0 100644
--- a/environments/standalone/standalone-tripleo.yaml
+++ b/environments/standalone/standalone-tripleo.yaml
@@ -75,6 +75,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::Docker: OS::Heat::None
   OS::TripleO::Services::DockerRegistry: ../../deployment/image-serve/image-serve-baremetal-ansible.yaml
   OS::TripleO::Services::GnocchiApi: OS::Heat::None
   OS::TripleO::Services::GnocchiMetricd: OS::Heat::None
diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml
index 36ce267400..b43f0f019b 100644
--- a/sample-env-generator/standalone.yaml
+++ b/sample-env-generator/standalone.yaml
@@ -64,6 +64,8 @@ environments:
 
       OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.yaml
 
+      # Disable Docker
+      OS::TripleO::Services::Docker: OS::Heat::None
       # Activate container image prepare
       OS::TripleO::Services::ContainerImagePrepare: ../../deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml
       OS::TripleO::Services::Podman: ../../deployment/podman/podman-baremetal-ansible.yaml