diff --git a/ci/environments/scenario008-multinode-containers.yaml b/ci/environments/scenario008-multinode-containers.yaml
new file mode 100644
index 0000000000..cd09d33498
--- /dev/null
+++ b/ci/environments/scenario008-multinode-containers.yaml
@@ -0,0 +1,56 @@
+resource_registry:
+  OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
+  OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
+  OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None
+  OS::TripleO::Tasks::ControllerPostPuppetRestart: .OS::Heat::None
+  OS::TripleO::Services::OpenDaylightApi: ../../docker/services/opendaylight-api.yaml
+  OS::TripleO::Services::OpenDaylightOvs: ../../puppet/services/opendaylight-ovs.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-odl.yaml
+
+parameter_defaults:
+  ControllerServices:
+    - OS::TripleO::Services::Docker
+    - OS::TripleO::Services::GlanceApi
+    - OS::TripleO::Services::HAproxy
+    - OS::TripleO::Services::HeatApi
+    - OS::TripleO::Services::HeatApiCfn
+    - OS::TripleO::Services::HeatApiCloudwatch
+    - OS::TripleO::Services::HeatEngine
+    - OS::TripleO::Services::Keepalived
+    - OS::TripleO::Services::Kernel
+    - OS::TripleO::Services::Keystone
+    - OS::TripleO::Services::Memcached
+    - OS::TripleO::Services::MySQL
+    - OS::TripleO::Services::MySQLClient
+    - OS::TripleO::Services::NeutronCorePlugin
+    - OS::TripleO::Services::NeutronDhcpAgent
+    - OS::TripleO::Services::NeutronMetadataAgent
+    - OS::TripleO::Services::NeutronServer
+    - OS::TripleO::Services::NovaApi
+    - OS::TripleO::Services::NovaCompute
+    - OS::TripleO::Services::NovaConductor
+    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaMetadata
+    - OS::TripleO::Services::NovaPlacement
+    - OS::TripleO::Services::NovaScheduler
+    - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::OpenDaylightApi
+    - OS::TripleO::Services::OpenDaylightOvs
+    - OS::TripleO::Services::OsloMessagingNotify
+    - OS::TripleO::Services::OsloMessagingRpc
+    - OS::TripleO::Services::Snmp
+    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Timezone
+    - OS::TripleO::Services::TripleoPackages
+    - OS::TripleO::Services::TripleoFirewall
+  NeutronTypeDrivers: 'vlan,flat,vxlan'
+  Debug: true
+  DockerPuppetDebug: true
+  # we don't deploy Swift so we switch to file backend.
+  GlanceBackend: 'file'
+  KeystoneTokenProvider: 'fernet'
+  SwiftCeilometerPipelineEnabled: false
+  NeutronEnableForceMetadata: true
+  NeutronMechanismDrivers: 'opendaylight_v2'
+  NeutronServicePlugins: 'odl-router_v2,trunk'
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index e4221c090f..598a9c4cec 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -83,6 +83,13 @@
               - ^(docker|puppet)/services/.*tacker.*$
               - ^environments\/.*.yaml
               - ^deployed-server/.*$
+        - tripleo-ci-centos-7-scenario008-multinode-oooq-container:
+            files:
+              - ci/environments/scenario008-multinode-containers.yaml
+              - ^(docker|puppet)/services/.*(odl|opendaylight).*$
+              - ^(docker|puppet)/services/neutron-plugin-ml2.yaml #LP1765975
+              - ^environments\/.*.yaml
+              - ^deployed-server/.*$
     gate:
       queue: tripleo
       jobs:
@@ -161,13 +168,6 @@
               - ci/environments/scenario005-multinode.yaml
               - ci/pingtests/scenario005-multinode.yaml
               - ^deployed-server/.*$
-        - tripleo-ci-centos-7-scenario008-multinode-oooq:
-            files:
-              - ^environments/.*opendaylight.*$
-              - ^puppet/services/.*opendaylight.*$
-              - ci/environments/scenario008-multinode.yaml
-              - ci/pingtests/scenario008-multinode.yaml
-              - ^deployed-server/.*$
         - tripleo-ci-centos-7-scenario009-multinode-oooq:
             files:
               - ^coe/openshift.*$