diff --git a/environments/docker.yaml b/environments/docker.yaml
index f7b75a4652..d290e0ba9f 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -56,6 +56,9 @@ resource_registry:
   OS::TripleO::Services::CinderApi: ../docker/services/cinder-api.yaml
   OS::TripleO::Services::CinderScheduler: ../docker/services/cinder-scheduler.yaml
   OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml
+  # FIXME: Note we explicitely disable SwiftDispersion until a containerized version of it is merged
+  OS::TripleO::Services::SwiftDispersion: OS::Heat::None
+
 
   # If SR-IOV is enabled on the compute nodes, it will need the SR-IOV
   # host configuration.