diff --git a/tcp_tests/templates/cookied-small-mcp-ironic/environment-context.yaml b/tcp_tests/templates/cookied-small-mcp-ironic/environment-context.yaml
index fb103d7..057ef10 100644
--- a/tcp_tests/templates/cookied-small-mcp-ironic/environment-context.yaml
+++ b/tcp_tests/templates/cookied-small-mcp-ironic/environment-context.yaml
@@ -16,11 +16,9 @@
     ctl01:
       reclass_storage_name: openstack_control_node01
       roles:
-      - infra_kvm
       - openstack_control_leader
       - openstack_database_leader
       - openstack_message_queue
-      - features_lvm_backend_control
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -31,11 +29,9 @@
     ctl02:
       reclass_storage_name: openstack_control_node02
       roles:
-      - infra_kvm
       - openstack_control
       - openstack_database
       - openstack_message_queue
-      - features_lvm_backend_control
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -46,11 +42,9 @@
     ctl03:
       reclass_storage_name: openstack_control_node03
       roles:
-      - infra_kvm
       - openstack_control
       - openstack_database
       - openstack_message_queue
-      - features_lvm_backend_control
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -103,3 +97,58 @@
           role: single_ctl
         ens7:
           role: single_baremetal
+
+    kvm01.cookied-cicd-bm-os-contrail40-maas.local:
+      reclass_storage_name: infra_kvm_node01
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        ens3:
+          role: single_dhcp
+        ens4:
+          role: bond0_ab_ovs_vlan_ctl
+        ens5:
+          role: single_mgm_manual
+
+    kvm02.cookied-cicd-bm-os-contrail40-maas.local:
+      reclass_storage_name: infra_kvm_node02
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        ens3:
+          role: single_dhcp
+        ens4:
+          role: bond0_ab_ovs_vlan_ctl
+        ens5:
+          role: single_mgm_manual
+
+    kvm03.cookied-cicd-bm-os-contrail40-maas.local:
+      reclass_storage_name: infra_kvm_node03
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        ens3:
+          role: single_dhcp
+        ens4:
+          role: bond0_ab_ovs_vlan_ctl
+        ens5:
+          role: single_mgm_manual
+
+    cmp<<count>>:
+      reclass_storage_name: openstack_compute_rack01
+      roles:
+      - openstack_compute
+      - features_lvm_backend_volume_vdb
+      - linux_system_codename_xenial
+      interfaces:
+        ens3:
+          role: single_dhcp
+        ens4:
+          role: single_ctl
+        ens5:
+          role: bond0_ab_ovs_vxlan_mesh
+        ens6:
+          role: bond1_ab_ovs_floating