diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/openstack.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/openstack.yaml
index a624e09..ab39f0b 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/openstack.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/openstack.yaml
@@ -4,7 +4,8 @@
 #{% from 'cookied-bm-mcp-dvr-vxlan/underlay.yaml' import HOSTNAME_GTW02 with context %}
 {% from 'shared-salt.yaml' import IPV4_NET_EXTERNAL_PREFIX with context %}
 {% from 'shared-salt.yaml' import IPV4_NET_TENANT_PREFIX with context %}
-{% set PATTERN = os_env('PATTERN', 'smoke') %}
+{% set PATTERN = os_env('PATTERN', 'false') %}
+{% set RUN_TEMPEST = os_env('RUN_TEMPEST', 'false') %}
 
 # Install OpenStack control services
 
@@ -92,6 +93,13 @@
   retry: {count: 1, delay: 5}
   skip_fail: false
 
+- description: Install cinder volume
+  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+    -C 'I@cinder:volume' state.sls cinder
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
+
 - description: Check cinder list
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
     -C 'I@keystone:server' cmd.run '. /root/keystonerc; cinder list'
@@ -287,9 +295,9 @@
 - description: Run tests
   cmd: |
     if [[ {{ PATTERN }} == "false" ]]; then
-        docker run --rm --net=host  -e TEMPEST_CONF=lvm_mcp.conf  -e SKIP_LIST=mcp_skip.list  -e SOURCE_FILE=keystonercv3 -v /etc/ssl/certs/:/etc/ssl/certs/ -v /root/:/home/rally docker-sandbox.sandbox.mirantis.net/rally-tempest/rally-tempest:with_designate  >> image.output
+        docker run --rm --net=host -e SOURCE_FILE=/home/rally/keystonercv3 -e LOG_DIR=/home/rally/rally_reports/all -e SET=full -e CUSTOM="--pattern tempest --detail" -e CONCURRENCY=2 -e TEMPEST_CONF=lvm_mcp.conf -e SKIP_LIST=mcp_skip.list -e DO_CLEANUP_RESOURCES=false -v /root/keystonercv3:/home/rally/keystonercv3 -v /root/rally_reports:/home/rally/rally_reports -v /etc/ssl/certs/:/etc/ssl/certs/ docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest    else
     else
-        docker run --rm --net=host  -e TEMPEST_CONF=lvm_mcp.conf  -e SKIP_LIST=mcp_skip.list  -e SOURCE_FILE=keystonercv3 -v /etc/ssl/certs/:/etc/ssl/certs/ -e CUSTOM='--pattern {{ PATTERN }}' -v /root/:/home/rally docker-sandbox.sandbox.mirantis.net/rally-tempest/rally-tempest:with_designate  >> image.output
+        docker run --rm --net=host -e SOURCE_FILE=/home/rally/keystonercv3 -e LOG_DIR=/home/rally/rally_reports/all -e SET=full -e CUSTOM="--pattern {{ PATTERN }} --detail" -e CONCURRENCY=2 -e TEMPEST_CONF=lvm_mcp.conf -e SKIP_LIST=mcp_skip.list -e DO_CLEANUP_RESOURCES=false -v /root/keystonercv3:/home/rally/keystonercv3 -v /root/rally_reports:/home/rally/rally_reports -v /etc/ssl/certs/:/etc/ssl/certs/ docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest    else
     fi
   node_name: {{ HOSTNAME_GTW01 }}
   retry: {count: 1, delay: 5}
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-lab03-environment.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-lab03-environment.yaml
index 8a9c33d..b5e831d 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-lab03-environment.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-lab03-environment.yaml
@@ -48,6 +48,7 @@
       reclass_storage_name: openstack_compute_node01
       roles:
       - openstack_compute
+#      - features_lvm_backend
       - linux_system_codename_xenial
       interfaces:
         enp3s0f0:
@@ -66,6 +67,7 @@
       reclass_storage_name: openstack_compute_node02
       roles:
       - openstack_compute
+      - features_lvm_backend
       - linux_system_codename_xenial
       interfaces:
         eno1:
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-vcp-environment.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-vcp-environment.yaml
index 8623fd2..ab61036 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-vcp-environment.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-vcp-environment.yaml
@@ -38,8 +38,6 @@
       - openstack_database_leader
       - linux_system_codename_xenial
       interfaces:
-        ens2:
-          role: single_dhcp
         ens3:
           role: single_ctl
 
@@ -49,8 +47,6 @@
       - openstack_database
       - linux_system_codename_xenial
       interfaces:
-        ens2:
-          role: single_dhcp
         ens3:
           role: single_ctl
 
@@ -60,8 +56,6 @@
       - openstack_database
       - linux_system_codename_xenial
       interfaces:
-        ens2:
-          role: single_dhcp
         ens3:
           role: single_ctl
 
@@ -71,8 +65,6 @@
       - openstack_message_queue
       - linux_system_codename_xenial
       interfaces:
-        ens2:
-          role: single_dhcp
         ens3:
           role: single_ctl
 
@@ -82,8 +74,6 @@
       - openstack_message_queue
       - linux_system_codename_xenial
       interfaces:
-        ens2:
-          role: single_dhcp
         ens3:
           role: single_ctl
 
@@ -93,8 +83,6 @@
       - openstack_message_queue
       - linux_system_codename_xenial
       interfaces:
-        ens2:
-          role: single_dhcp
         ens3:
           role: single_ctl
 
@@ -104,8 +92,6 @@
       - openstack_proxy
       - linux_system_codename_xenial
       interfaces:
-        ens2:
-          role: single_dhcp
         ens3:
           role: single_ctl
 
@@ -115,16 +101,32 @@
       - openstack_proxy
       - linux_system_codename_xenial
       interfaces:
-        ens2:
-          role: single_dhcp
         ens3:
           role: single_ctl
 
-#      bmk01.cookied-bm-mcp-dvr-vxlan.local:
-#      reclass_storage_name: openstack_benchmark_node01
-#      roles:
-#      - openstack_benchmark
-#      - linux_system_codename_xenial
-#      interfaces:
-#        ens3:
-#          role: single_ctl
\ No newline at end of file
+    mtr01.cookied-bm-mcp-dvr-vxlan.local:
+      reclass_storage_name: stacklight_telemetry_node01
+      roles:
+      - stacklight_telemetry
+      - linux_system_codename_xenial
+      interfaces:
+        ens3:
+          role: single_ctl
+
+    mtr02.cookied-bm-mcp-dvr-vxlan.local:
+      reclass_storage_name: stacklight_telemetry_node02
+      roles:
+      - stacklight_telemetry
+      - linux_system_codename_xenial
+      interfaces:
+        ens3:
+          role: single_ctl
+
+    mtr03.cookied-bm-mcp-dvr-vxlan.local:
+      reclass_storage_name: stacklight_telemetry_node03
+      roles:
+      - stacklight_telemetry
+      - linux_system_codename_xenial
+      interfaces:
+        ens3:
+          role: single_ctl
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt.yaml
index 369c76d..64d1f38 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt.yaml
@@ -23,6 +23,14 @@
 
 {{ SHARED.MACRO_GENERATE_COOKIECUTTER_MODEL(CONTROL_VLAN=CONTROL_VLAN, TENANT_VLAN=TENANT_VLAN) }}
 
+- description: Temporary WR for cinder backend defined by default in reclass.system
+  cmd: |
+    sed -i 's/backend\:\ {}//g' /srv/salt/reclass/classes/system/cinder/control/cluster.yml;
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
+
+
 {{ SHARED.MACRO_GENERATE_AND_ENABLE_ENVIRONMENT_MODEL() }}
 
 - description: "Workaround for rack01 compute generator"
@@ -66,6 +74,14 @@
   retry: {count: 1, delay: 5}
   skip_fail: false
 
+- description: Temporary workaround for removing cinder-volume from CTL nodes
+  cmd: |
+    sed -i 's/\-\ system\.cinder\.volume\.single//g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/control.yml;
+    sed -i 's/\-\ system\.cinder\.volume\.notification\.messagingv2//g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/control.yml;
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: true
+
 ########################################
 # Spin up Control Plane VMs on KVM nodes
 ########################################