diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 24efd98..3edf1f9 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -10,6 +10,7 @@
   cicd_control_vip_address: 10.167.11.90
   cicd_control_vip_hostname: cid
   cicd_enabled: 'True'
+  infra_config_address: 172.16.162.66
   cluster_domain: bm-e7-cicd-pike-ovs-maas.local
   cluster_name: bm-e7-cicd-pike-ovs-maas
   compute_bond_mode: active-backup
@@ -49,9 +50,6 @@
   infra_kvm05_control_address: 10.167.11.245
   infra_kvm05_deploy_address: 172.16.162.71
   infra_kvm05_hostname: kvm05
-  infra_kvm06_control_address: 10.167.11.246
-  infra_kvm06_deploy_address: 172.16.162.72
-  infra_kvm06_hostname: kvm06
   infra_kvm_vip_address: 10.167.11.240
   infra_primary_first_nic: eth1
   infra_primary_second_nic: eth2
@@ -84,24 +82,16 @@
               name: one1
             one2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:33:24:bf"
+              mac: "0c:c4:7a:33:26:75"
               name: one2
             ten1:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:1e:01:3e"
+              mac: "0c:c4:7a:1d:f3:3e"
               name: ten1
             ten2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:1e:01:3f"
+              mac: "0c:c4:7a:1d:f3:3f"
               name: ten2
-            sten1:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:58:f3:ce"
-              name: sten1
-            sten2:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:58:f3:cf"
-              name: sten2
           power_parameters:
             power_address: "176.74.217.64"
             power_pass: ==IPMI_PASS==
@@ -121,24 +111,16 @@
               name: one1
             one2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:33:2d:6b"
+              mac: "0c:c4:7a:33:25:c3"
               name: one2
             ten1:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:58:43:b8"
+              mac: "00:25:90:61:c9:e0"
               name: ten1
             ten2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:58:43:b9"
+              mac: "00:25:90:61:c9:e1"
               name: ten2
-            sten1:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:1d:96:02"
-              name: sten1
-            sten2:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:1d:96:03"
-              name: sten2
           power_parameters:
             power_address: "185.8.59.228"
             power_pass: ==IPMI_PASS==
@@ -158,24 +140,16 @@
               name: one1
             one2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:69:a0:4d"
+              mac: "0c:c4:7a:69:a0:51"
               name: one2
             ten1:
               mode: UNCONFIGURED
-              mac: "00:25:90:c0:c2:14"
+              mac: "00:25:90:3a:f0:38"
               name: ten1
             ten2:
               mode: UNCONFIGURED
-              mac: "00:25:90:c0:c2:15"
+              mac: "00:25:90:3a:f0:39"
               name: ten2
-            sten1:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:1e:09:c2"
-              name: sten1
-            sten2:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:1e:09:c3"
-              name: sten2
           power_parameters:
             power_address: "5.43.225.89"
             power_pass: ==IPMI_PASS==
@@ -196,24 +170,16 @@
               name: one1
             one2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:6c:83:5d"
+              mac: "0c:c4:7a:6d:3d:fb"
               name: one2
             ten1:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:1f:7d:98"
+              mac: "0c:c4:7a:1e:41:88"
               name: ten1
             ten2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:1f:7d:99"
+              mac: "0c:c4:7a:1e:41:89"
               name: ten2
-            sten1:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:1e:03:de"
-              name: sten1
-            sten2:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:1e:03:df"
-              name: sten2
           power_parameters:
             power_address: "5.43.227.11"
             power_pass: ==IPMI_PASS==
@@ -233,24 +199,16 @@
               name: one1
             one2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:6c:88:d7"
+              mac: "0c:c4:7a:34:53:2b"
               name: one2
             ten1:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:1e:03:74"
+              mac: "0c:c4:7a:1d:92:c8"
               name: ten1
             ten2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:1e:03:75"
+              mac: "0c:c4:7a:1d:92:c9"
               name: ten2
-            sten1:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:1f:89:be"
-              name: sten1
-            sten2:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:1f:89:bf"
-              name: sten2
           power_parameters:
             power_address: "5.43.227.19"
             power_pass: ==IPMI_PASS==
@@ -270,24 +228,16 @@
               name: one1
             one2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:aa:df:ad"
+              mac: "0c:c4:7a:34:52:0d"
               name: one2
             ten1:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:1e:3a:f2"
+              mac: "0c:c4:7a:58:e9:66"
               name: ten1
             ten2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:1e:3a:f3"
+              mac: "0c:c4:7a:58:e9:67"
               name: ten2
-            sten1:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:1e:a6:4c"
-              name: sten1
-            sten2:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:1e:a6:4d"
-              name: sten2
           power_parameters:
             power_address: "5.43.225.74"
             power_pass: ==IPMI_PASS==
@@ -307,24 +257,16 @@
               name: one1
             one2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:aa:d5:85"
+              mac: "0c:c4:7a:34:66:ff"
               name: one2
             ten1:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:58:41:b0"
+              mac: "0c:c4:7a:1e:3e:cc"
               name: ten1
             ten2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:58:41:b1"
+              mac: "0c:c4:7a:1e:3e:cd"
               name: ten2
-            sten1:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:1d:90:d2"
-              name: sten1
-            sten2:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:1d:90:d3"
-              name: sten2
           power_parameters:
             power_address: "5.43.225.16"
             power_pass: ==IPMI_PASS==
@@ -333,10 +275,10 @@
         cmp002: # #cz7950
           distro_series: "xenial"
           # hwe_kernel: "hwe-16.04"
-          pxe_interface_mac: "0c:c4:7a:6c:87:50"
+          pxe_interface_mac: "0c:c4:7a:6c:83:60"
           interfaces:
             one1:
-              mac: "0c:c4:7a:6c:87:50"
+              mac: "0c:c4:7a:6c:83:60"
               mode: "static"
               ip: "172.16.162.74"
               subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
@@ -344,24 +286,16 @@
               name: one1
             one2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:aa:d5:83"
+              mac: "0c:c4:7a:6c:83:61"
               name: one2
             ten1:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:1f:00:7c"
+              mac: "0c:c4:7a:1e:9d:42"
               name: ten1
             ten2:
               mode: UNCONFIGURED
-              mac: "0c:c4:7a:1f:00:7d"
+              mac: "0c:c4:7a:1e:9d:43"
               name: ten2
-            sten1:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:bc:88:8a"
-              name: sten1
-            sten2:
-              mode: UNCONFIGURED
-              mac: "0c:c4:7a:bc:88:8b"
-              name: sten2
           power_parameters:
             power_address: "5.43.225.172"
             power_pass: ==IPMI_PASS==
@@ -445,7 +379,7 @@
   reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
   salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
   salt_api_password_hash: $6$qdIFillN$XnzP7oIXRcbroVch7nlthyrSekjKlWND8q2MtoMF3Wz2ymepjAOjyqpyR55nmbH9OQzS8EcQJ6sfr5hWKDesV1
-  salt_master_address: 10.167.11.5
+  salt_master_address: 172.16.162.66
   salt_master_hostname: cfg01
   salt_master_management_address: 172.16.162.66
   shared_reclass_branch: proposed
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml
index 820c2d5..1e2069f 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml
@@ -8,8 +8,6 @@
       interfaces:
         ens3:
           role: single_static_mgm
-        ens4:
-          role: single_static_ctl
 
     # Physical nodes
     kvm01.bm-e7-cicd-pike-ovs-maas.local:
@@ -20,9 +18,9 @@
       interfaces:
         one1:
           role: single_mgm_dhcp
-        ten2:
+        ten1:
           role: bond_ctl_lacp
-        sten2:
+        ten2:
           role: bond_ctl_lacp
 
     kvm02.bm-e7-cicd-pike-ovs-maas.local:
@@ -33,9 +31,9 @@
       interfaces:
         one1:
           role: single_mgm_dhcp
-        ten2:
+        ten1:
           role: bond_ctl_lacp
-        sten2:
+        ten2:
           role: bond_ctl_lacp
 
     kvm03.bm-e7-cicd-pike-ovs-maas.local:
@@ -46,9 +44,9 @@
       interfaces:
         one1:
           role: single_mgm_dhcp
-        ten2:
+        ten1:
           role: bond_ctl_lacp
-        sten2:
+        ten2:
           role: bond_ctl_lacp
 
     kvm04.bm-e7-cicd-pike-ovs-maas.local:
@@ -60,9 +58,9 @@
       interfaces:
         one1:
           role: single_mgm_dhcp
-        ten2:
+        ten1:
           role: bond_ctl_lacp
-        sten2:
+        ten2:
           role: bond_ctl_lacp
 
     kvm05.bm-e7-cicd-pike-ovs-maas.local:
@@ -74,24 +72,10 @@
       interfaces:
         one1:
           role: single_mgm_dhcp
+        ten1:
+          role: bond_ctl_lacp
         ten2:
           role: bond_ctl_lacp
-        sten2:
-          role: bond_ctl_lacp
-
-    kvm06.bm-e7-cicd-pike-ovs-maas.local:
-      reclass_storage_name: infra_kvm_node06
-      roles:
-      - infra_kvm_wo_gluster
-      - linux_system_codename_xenial
-      - salt_master_host
-      interfaces:
-        one1:
-          role: single_mgm_dhcp
-        ten2:
-          role: bond_ctl_lacp
-        sten2:
-          role: bond_ctl_lacp
 
     cmp<<count>>:
       reclass_storage_name: openstack_compute_rack01
@@ -104,11 +88,8 @@
         ten1:
           role: bond_ctl_lacp
         ten2:
-          role: bond_prv_lacp
-        sten1:
           role: bond_ctl_lacp
-        sten2:
-          role: bond_prv_lacp
+
 
     gtw01.bm-e7-cicd-pike-ovs-maas.local:
       reclass_storage_name: openstack_gateway_node01
@@ -121,9 +102,5 @@
         ten1:
           role: bond_ctl_lacp
         ten2:
-          role: bond_prv_lacp
-        sten1:
           role: bond_ctl_lacp
-        sten2:
-          role: bond_prv_lacp
 
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml
index ffc0d69..8b3822d 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml
@@ -27,17 +27,6 @@
       "5.43.225.172"
   ]) }}
 
-{{ SHARED_MAAS.REBOOT_HW_NODES('engineer', 'K7wy5Y39g6Ii',
-  [
-      "176.74.217.64",
-      "185.8.59.228",
-      "5.43.225.89",
-      "5.43.227.11",
-      "5.43.227.19",
-      "5.43.225.74",
-      "5.43.225.16",
-      "5.43.225.172"
-  ]) }}
 
 {{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
 
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay--user-data-foundation.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay--user-data-foundation.yaml
index c9fd9d6..e52d56d 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay--user-data-foundation.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay--user-data-foundation.yaml
@@ -49,12 +49,9 @@
   - find /etc/network/interfaces.d/ -type f -delete
   - kill $(pidof /sbin/dhclient) || /bin/true
   - ip a flush dev ens3
-  - ip a flush dev ens4
   - rm -f /var/run/network/ifstate.ens3
-  - rm -f /var/run/network/ifstate.ens4
   - ip route delete default || /bin/true
   - ifup ens3
-  - ifup ens4
 
 write_files:
   - path: /etc/default/grub.d/97-enable-grub-menu.cfg
@@ -72,11 +69,6 @@
       gateway $management_gw
       dns-nameservers $dnsaddress
 
-      auto ens4
-      iface ens4 inet static
-      address $control_static_ip
-      netmask 255.255.255.0
-
   - path: /etc/bash_completion.d/fuel_devops30_activate
     content: |
       source /home/jenkins/fuel-devops30/bin/activate
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay.hot b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay.hot
index 99c2bd9..67940c7 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay.hot
@@ -1,6 +1,6 @@
 ---
 
-heat_template_version: pike
+heat_template_version: queens
 
 description: MCP environment for bm-e7-cicd-pike-ovs-maas
 
@@ -48,7 +48,7 @@
     default: 172.16.162.100
   salt_master_control_ip:
     type: string
-    default: 10.167.11.5
+    default: 172.16.162.66
   deploy_empty_node:
     type: boolean
     default: False