diff --git a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml
new file mode 100644
index 0000000..768df20
--- /dev/null
+++ b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml
@@ -0,0 +1,109 @@
+nodes:
+    cfg01.cookied-cicd-ovs-maas.local:
+      reclass_storage_name: infra_config_node01
+      roles:
+      - infra_config
+      - linux_system_codename_xenial
+      interfaces:
+        ens3:
+          role: single_static_mgm
+        ens4:
+          role: single_static_ctl
+
+    # Physical nodes
+    kvm01.cookied-cicd-ovs-maas.local:
+      reclass_storage_name: infra_kvm_node01
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        enp3s0f0:
+          role: single_mgm_dhcp
+        enp3s0f1:
+          role: bond0_ab_ovs_vlan_ctl
+
+    kvm02.cookied-cicd-ovs-maas.local:
+      reclass_storage_name: infra_kvm_node02
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        enp3s0f0:
+          role: single_mgm_dhcp
+        enp3s0f1:
+          role: bond0_ab_ovs_vlan_ctl
+
+    kvm03.cookied-cicd-ovs-maas.local:
+      reclass_storage_name: infra_kvm_node03
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        enp3s0f0:
+          role: single_mgm_dhcp
+        enp3s0f1:
+          role: bond0_ab_ovs_vlan_ctl
+
+    osd<<count>>:
+      reclass_storage_name: ceph_osd_rack01
+      roles:
+      - ceph_osd
+      - linux_system_codename_xenial
+      interfaces:
+        enp9s0f0:
+          role: single_dhcp
+        enp9s0f1:
+          role: single_vlan_ctl
+#          role: bond0_ab_vlan_ceph_storage_backend
+
+    cmp<<count>>:
+      reclass_storage_name: openstack_compute_rack01
+      roles:
+      - openstack_compute
+      - linux_system_codename_xenial
+      interfaces:
+        enp9s0f0:
+          role: single_mgm_dhcp
+        enp9s0f1:
+          role: bond0_ab_dvr_vxlan_ctl_mesh_floating
+
+    gtw01.cookied-cicd-ovs-maas.local:
+      reclass_storage_name: openstack_gateway_node01
+      roles:
+      - openstack_gateway
+      - linux_system_codename_xenial
+      classes:
+      - system.linux.system.repo.mcp.apt_mirantis.docker
+      interfaces:
+        enp3s0f0:
+          role: single_mgm_dhcp
+        enp3s0f1:
+          role: bond0_ab_dvr_vxlan_ctl_mesh_external
+          external_address: 172.17.42.5
+          external_network_netmask: 255.255.255.192
+
+    gtw02.cookied-cicd-ovs-maas.local:
+      reclass_storage_name: openstack_gateway_node02
+      roles:
+      - openstack_gateway
+      - linux_system_codename_xenial
+      interfaces:
+        enp3s0f0:
+          role: single_mgm_dhcp
+        enp3s0f1:
+          role: bond0_ab_dvr_vxlan_ctl_mesh_external
+          external_address: 172.17.42.6
+          external_network_netmask: 255.255.255.192
+
+    gtw03.cookied-cicd-ovs-maas.local:
+      reclass_storage_name: openstack_gateway_node03
+      roles:
+      - openstack_gateway
+      - linux_system_codename_xenial
+      interfaces:
+        enp2s0f0:
+          role: single_mgm_dhcp
+        enp2s0f1:
+          role: bond0_ab_dvr_vxlan_ctl_mesh_external
+          external_address: 172.17.42.7
+          external_network_netmask: 255.255.255.192