diff --git a/ci/environments/multinode-containers.yaml b/ci/environments/multinode-containers.yaml
index d2ff14f8c2..5c76e09ff2 100644
--- a/ci/environments/multinode-containers.yaml
+++ b/ci/environments/multinode-containers.yaml
@@ -56,5 +56,6 @@ parameter_defaults:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::libvirt_virt_type: qemu
   Debug: True
+  DockerPuppetDebug: True
   NotificationDriver: 'noop'
   GlanceBackend: 'file'
diff --git a/ci/environments/multinode_major_upgrade.yaml b/ci/environments/multinode_major_upgrade.yaml
index a49ae771ca..608489fff8 100644
--- a/ci/environments/multinode_major_upgrade.yaml
+++ b/ci/environments/multinode_major_upgrade.yaml
@@ -64,5 +64,6 @@ parameter_defaults:
     heat::rpc_response_timeout: 600
   SwiftCeilometerPipelineEnabled: False
   Debug: True
+  DockerPuppetDebug: True
   NotificationDriver: 'noop'
   GlanceBackend: 'file'
diff --git a/ci/environments/ovb-ha.yaml b/ci/environments/ovb-ha.yaml
index 579d85a01e..1e2d8f32e8 100644
--- a/ci/environments/ovb-ha.yaml
+++ b/ci/environments/ovb-ha.yaml
@@ -53,4 +53,5 @@ parameter_defaults:
   ControllerExtraConfig:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::libvirt_virt_type: qemu
-  Debug: true
\ No newline at end of file
+  Debug: true
+  DockerPuppetDebug: True
diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index 05926fd6ff..3d14344a53 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -109,6 +109,7 @@ parameter_defaults:
     - panko://
 
   Debug: true
+  DockerPuppetDebug: True
   #TODO(gfidente): remove when the new default is in tripleo-common
   DockerCephDaemonImage: docker.io/ceph/daemon:tag-build-master-luminous-centos-7
   CephAnsibleDisksConfig:
diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml
index ce3a754ed6..23f6cdc59b 100644
--- a/ci/environments/scenario002-multinode-containers.yaml
+++ b/ci/environments/scenario002-multinode-containers.yaml
@@ -103,6 +103,7 @@ parameter_defaults:
     - panko://
   GnocchiArchivePolicy: 'high'
   Debug: true
+  DockerPuppetDebug: True
   ZaqarMessageStore: 'swift'
   ZaqarManagementStore: 'sqlalchemy'
   SwiftCeilometerPipelineEnabled: false
diff --git a/ci/environments/scenario003-multinode-containers.yaml b/ci/environments/scenario003-multinode-containers.yaml
index 462b5722e1..bd7f8c401b 100644
--- a/ci/environments/scenario003-multinode-containers.yaml
+++ b/ci/environments/scenario003-multinode-containers.yaml
@@ -66,6 +66,7 @@ parameter_defaults:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::libvirt_virt_type: qemu
   Debug: true
+  DockerPuppetDebug: True
   # we don't deploy Swift so we switch to file backend.
   GlanceBackend: 'file'
   KeystoneTokenProvider: 'fernet'
diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml
index 061d14d064..05c15b9f5f 100644
--- a/ci/environments/scenario004-multinode-containers.yaml
+++ b/ci/environments/scenario004-multinode-containers.yaml
@@ -91,6 +91,7 @@ parameter_defaults:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::libvirt_virt_type: qemu
   Debug: true
+  DockerPuppetDebug: True
   #TODO(gfidente): remove when the new default is in tripleo-common
   DockerCephDaemonImage: docker.io/ceph/daemon:tag-build-master-luminous-centos-7
   CephAnsibleDisksConfig:
diff --git a/ci/environments/scenario006-multinode-containers.yaml b/ci/environments/scenario006-multinode-containers.yaml
index 025fd81e28..f3165f6723 100644
--- a/ci/environments/scenario006-multinode-containers.yaml
+++ b/ci/environments/scenario006-multinode-containers.yaml
@@ -46,6 +46,7 @@ parameter_defaults:
     - OS::TripleO::Services::TripleoFirewall
 
   Debug: true
+  DockerPuppetDebug: True
   BannerText: |
     ******************************************************************
     * This system is for the use of authorized users only. Usage of  *
diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml
index 8acf5ee9dd..daea6da846 100644
--- a/ci/environments/scenario007-multinode-containers.yaml
+++ b/ci/environments/scenario007-multinode-containers.yaml
@@ -70,6 +70,7 @@ parameter_defaults:
   NeutronVniRanges: ['1:65536', ]
   OVNBridgeMappings: 'datacentre:br-ex'
   Debug: true
+  DockerPuppetDebug: True
   BannerText: |
     ******************************************************************
     * This system is for the use of authorized users only. Usage of  *