diff --git a/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index f89349d..a07c16b 100644
--- a/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -19,17 +19,14 @@
   control_network_netmask: 255.255.255.0
   control_network_subnet: 10.167.11.0/24
   control_vlan: '2404'
-  cookiecutter_template_branch: proposed
+
   jenkins_pipelines_branch: 'release/2019.2.0'
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
   deploy_network_gateway: 172.16.164.1
   deploy_network_netmask: 255.255.255.192
   deploy_network_subnet: 172.16.164.0/26
   deployment_type: physical
   dns_server01: 172.18.176.6
   dns_server02: 172.18.224.6
-  email_address: test@mirantis.com
   gateway_primary_first_nic: eth1
   gateway_primary_second_nic: eth2
   infra_bond_mode: active-backup
@@ -63,7 +60,6 @@
   maas_deploy_gateway: 172.16.164.1
   maas_deploy_range_end: 172.16.164.61
   maas_deploy_range_start: 172.16.164.18
-  maas_deploy_vlan: '0'
   maas_dhcp_enabled: 'True'
   maas_fabric_name: fabric-0
   maas_hostname: cfg01
@@ -742,7 +738,6 @@
   stacklight_telemetry_node02_hostname: mtr02
   stacklight_telemetry_node03_address: 10.167.11.99
   stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
   static_ips_on_deploy_network_enabled: 'False'
   tenant_network_gateway: 10.167.12.1
   tenant_network_netmask: 255.255.255.0
@@ -839,7 +834,6 @@
   octavia_health_manager_node03_address: 192.168.1.12
   octavia_manager_cluster: 'False'
   octavia_spare_amphora_pool_size: 0
-  octavia_hm_bind_ip: 192.168.1.12
   octavia_lb_mgmt_cidr: 192.168.1.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.1.2
   octavia_lb_mgmt_allocation_pool_end: 192.168.1.200
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 31efecc..84a4633 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -34,17 +34,14 @@
   control_network_netmask: 255.255.255.0
   control_network_subnet: 10.167.11.0/24
   control_vlan: '2404'
-  cookiecutter_template_branch: proposed
+
   jenkins_pipelines_branch: 'release/2019.2.0'
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
   deploy_network_gateway: 172.16.164.1
   deploy_network_netmask: 255.255.255.192
   deploy_network_subnet: 172.16.164.0/26
   deployment_type: physical
   dns_server01: 172.18.176.6
   dns_server02: 172.18.224.6
-  email_address: test@mirantis.com
   gateway_primary_first_nic: eth1
   gateway_primary_second_nic: eth2
   infra_bond_mode: active-backup
@@ -78,7 +75,6 @@
   maas_deploy_gateway: 172.16.164.1
   maas_deploy_range_end: 172.16.164.62
   maas_deploy_range_start: 172.16.164.18
-  maas_deploy_vlan: '0'
   maas_dhcp_enabled: 'True'
   maas_fabric_name: fabric-0
   maas_hostname: cfg01
@@ -757,7 +753,6 @@
   stacklight_telemetry_node02_hostname: mtr02
   stacklight_telemetry_node03_address: 10.167.11.99
   stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
   static_ips_on_deploy_network_enabled: 'False'
   tenant_network_gateway: 10.167.12.1
   tenant_network_netmask: 255.255.255.0
@@ -865,7 +860,6 @@
   octavia_manager_cluster: 'True'
   octavia_amphora_topology: 'ACTIVE_STANDBY'
   octavia_spare_amphora_pool_size: 1
-  octavia_hm_bind_ip: 192.168.1.12
   octavia_lb_mgmt_cidr: 192.168.1.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.1.2
   octavia_lb_mgmt_allocation_pool_end: 192.168.1.200
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
index 4a01c59..695b947 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
@@ -20,17 +20,14 @@
   control_network_netmask: 255.255.255.0
   control_network_subnet: 10.167.11.0/24
   control_vlan: '2404'
-  cookiecutter_template_branch: proposed
+
   jenkins_pipelines_branch: 'release/2019.2.0'
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
   deploy_network_gateway: 172.16.162.65
   deploy_network_netmask: 255.255.255.192
   deploy_network_subnet: 172.16.162.64/26
   deployment_type: physical
   dns_server01: 172.18.176.6
   dns_server02: 172.18.224.6
-  email_address: test@mirantis.com
   gateway_primary_first_nic: eth1
   gateway_primary_second_nic: eth2
   infra_bond_mode: active-backup
@@ -55,7 +52,6 @@
   maas_deploy_gateway: 172.16.162.65
   maas_deploy_range_end: 172.16.162.125
   maas_deploy_range_start: 172.16.162.82
-  maas_deploy_vlan: '0'
   maas_dhcp_enabled: 'True'
   maas_fabric_name: fabric-0
   maas_hostname: cfg01
@@ -368,7 +364,6 @@
   stacklight_telemetry_node02_hostname: mtr02
   stacklight_telemetry_node03_address: 10.167.11.99
   stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
   static_ips_on_deploy_network_enabled: 'False'
   tenant_network_gateway: 10.167.13.1
   tenant_network_netmask: 255.255.255.0
@@ -427,7 +422,6 @@
   octavia_health_manager_node03_address: 192.168.1.12
   octavia_manager_cluster: 'False'
   octavia_spare_amphora_pool_size: 0
-  octavia_hm_bind_ip: 192.168.1.12
   octavia_lb_mgmt_cidr: 192.168.1.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.1.2
   octavia_lb_mgmt_allocation_pool_end: 192.168.1.200
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 89bb83e..f908804 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
@@ -20,17 +20,14 @@
   control_network_netmask: 255.255.255.0
   control_network_subnet: 10.167.11.0/24
   control_vlan: '2404'
-  cookiecutter_template_branch: proposed
+
   jenkins_pipelines_branch: 'release/2019.2.0'
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
   deploy_network_gateway: 172.16.162.65
   deploy_network_netmask: 255.255.255.192
   deploy_network_subnet: 172.16.162.64/26
   deployment_type: physical
   dns_server01: 172.18.176.6
   dns_server02: 172.18.224.6
-  email_address: test@mirantis.com
   gateway_primary_first_nic: eth1
   gateway_primary_second_nic: eth2
   infra_bond_mode: active-backup
@@ -55,7 +52,6 @@
   maas_deploy_gateway: 172.16.162.65
   maas_deploy_range_end: 172.16.162.125
   maas_deploy_range_start: 172.16.162.82
-  maas_deploy_vlan: '0'
   maas_dhcp_enabled: 'True'
   maas_fabric_name: fabric-0
   maas_hostname: cfg01
@@ -368,7 +364,6 @@
   stacklight_telemetry_node02_hostname: mtr02
   stacklight_telemetry_node03_address: 10.167.11.99
   stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
   static_ips_on_deploy_network_enabled: 'False'
   tenant_network_gateway: 10.167.13.1
   tenant_network_netmask: 255.255.255.0
@@ -427,7 +422,6 @@
   octavia_health_manager_node03_address: 192.168.1.12
   octavia_manager_cluster: 'False'
   octavia_spare_amphora_pool_size: 0
-  octavia_hm_bind_ip: 192.168.1.12
   octavia_lb_mgmt_cidr: 192.168.1.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.1.2
   octavia_lb_mgmt_allocation_pool_end: 192.168.1.200
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
index b956edf..57665ec 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -85,16 +85,13 @@
   backend_vlan: '2402'
   storage_vlan: '2405'  # not implemented yet, placeholder
   jenkins_pipelines_branch: 'release/2019.2.0'
-  cookiecutter_template_branch: ''
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
+
   deploy_network_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
   deploy_network_netmask: 255.255.255.192
   deploy_network_subnet: ==IPV4_NET_ADMIN_PREFIX==.0/26
   deployment_type: physical
   dns_server01: 172.18.176.6
   dns_server02: 172.18.224.6
-  email_address: sgudz@mirantis.com
   infra_bond_mode: active-backup
   infra_deploy_nic: eth0
   infra_kvm01_control_address: ==IPV4_NET_CONTROL_PREFIX==.241
@@ -129,7 +126,6 @@
   maas_deploy_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
   maas_deploy_range_end: ==IPV4_NET_ADMIN_PREFIX==.61
   maas_deploy_range_start: ==IPV4_NET_ADMIN_PREFIX==.18
-  maas_deploy_vlan: '0'
   maas_dhcp_enabled: 'True'
   maas_fabric_name: fabric-0
   maas_hostname: cfg01
@@ -806,7 +802,6 @@
   stacklight_telemetry_node02_hostname: mtr02
   stacklight_telemetry_node03_address: ==IPV4_NET_CONTROL_PREFIX==.99
   stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
   static_ips_on_deploy_network_enabled: 'False'
   tenant_network_gateway: ==IPV4_NET_TENANT_PREFIX==.220
   tenant_network_netmask: 255.255.255.0
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
index bb3d3d6..8b99955 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -85,16 +85,13 @@
   backend_vlan: '2402'
   storage_vlan: '2405'  # not implemented yet, placeholder
   jenkins_pipelines_branch: 'release/2019.2.0'
-  cookiecutter_template_branch: ''
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
+
   deploy_network_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
   deploy_network_netmask: 255.255.255.192
   deploy_network_subnet: ==IPV4_NET_ADMIN_PREFIX==.0/26
   deployment_type: physical
   dns_server01: 172.18.176.6
   dns_server02: 172.18.224.6
-  email_address: sgudz@mirantis.com
   infra_bond_mode: active-backup
   infra_deploy_nic: eth0
   infra_kvm01_control_address: ==IPV4_NET_CONTROL_PREFIX==.241
@@ -129,7 +126,6 @@
   maas_deploy_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
   maas_deploy_range_end: ==IPV4_NET_ADMIN_PREFIX==.61
   maas_deploy_range_start: ==IPV4_NET_ADMIN_PREFIX==.18
-  maas_deploy_vlan: '0'
   maas_dhcp_enabled: 'True'
   maas_fabric_name: fabric-0
   maas_hostname: cfg01
@@ -806,7 +802,6 @@
   stacklight_telemetry_node02_hostname: mtr02
   stacklight_telemetry_node03_address: ==IPV4_NET_CONTROL_PREFIX==.99
   stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
   static_ips_on_deploy_network_enabled: 'False'
   tenant_network_gateway: ==IPV4_NET_TENANT_PREFIX==.220
   tenant_network_netmask: 255.255.255.0
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 31b9b8f..d16b4bf 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -127,9 +127,7 @@
   control_network_netmask: 255.255.255.0
   control_network_subnet: 10.167.4.0/24
   control_vlan: '10'
-  cookiecutter_template_branch: 'proposed'
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
+
   jenkins_slave_type: 'ssh'
   deploy_network_gateway: 10.167.5.1
   deploy_network_netmask: 255.255.255.0
@@ -137,7 +135,6 @@
   deployment_type: physical
   dns_server01: 172.18.176.6
   dns_server02: 172.18.224.6
-  email_address: test@mirantis.com
   gateway_primary_first_nic: eth1
   gateway_primary_second_nic: eth2
   gnocchi_aggregation_storage: ceph
@@ -163,7 +160,6 @@
   maas_deploy_network_name: deploy_network
   maas_deploy_range_end: 10.167.5.230
   maas_deploy_range_start: 10.167.5.20
-  maas_deploy_vlan: '0'
   maas_enabled: 'False'
   maas_fabric_name: deploy_fabric
   maas_hostname: cfg01
@@ -261,7 +257,6 @@
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
   version: proposed
-  vnf_onboarding_enabled: 'False'
   openstack_telemetry_address: 10.167.4.83
   openstack_telemetry_hostname: mdb
   openstack_telemetry_node01_address: 10.167.4.84
@@ -296,7 +291,6 @@
   stacklight_telemetry_node02_hostname: mtr02
   stacklight_telemetry_node03_address: 10.167.4.99
   stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
   stacklight_long_term_storage_type: prometheus
   nova_vnc_tls_enabled: 'True'
   stacklight_ssl_enabled: 'True'
@@ -368,7 +362,6 @@
   octavia_health_manager_node03_address: 192.168.10.12
   octavia_manager_cluster: 'False'
   octavia_spare_amphora_pool_size: 1
-  octavia_hm_bind_ip: 192.168.10.12
   octavia_lb_mgmt_cidr: 192.168.10.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.10.2
   octavia_lb_mgmt_allocation_pool_end: 192.168.10.200
diff --git a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index 8800242..0311062 100644
--- a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -82,17 +82,13 @@
   control_network_subnet: ==IPV4_NET_CONTROL_PREFIX==.0/24
   control_vlan: '10'
   tenant_vlan: '20'
-  cookiecutter_template_branch: ''
   jenkins_pipelines_branch: 'release/2019.2.0'
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
   deploy_network_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
   deploy_network_netmask: 255.255.255.0
   deploy_network_subnet: ==IPV4_NET_ADMIN_PREFIX==.0/24
   deployment_type: physical
   dns_server01: 172.18.176.6
   dns_server02: 172.18.224.6
-  email_address: sgudz@mirantis.com
   infra_bond_mode: active-backup
   infra_deploy_nic: eth0
   infra_kvm01_control_address: ==IPV4_NET_CONTROL_PREFIX==.241
@@ -227,16 +223,12 @@
   stacklight_telemetry_node02_hostname: mtr02
   stacklight_telemetry_node03_address: ==IPV4_NET_CONTROL_PREFIX==.88
   stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
   static_ips_on_deploy_network_enabled: 'False'
   tenant_network_gateway: ==IPV4_NET_TENANT_PREFIX==.220
   tenant_network_netmask: 255.255.255.0
   tenant_network_subnet: ==IPV4_NET_TENANT_PREFIX==.0/24
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
-  openldap_domain: heat-cicd-queens-contrail41-sl.local
-  openldap_enabled: 'True'
-  openldap_organisation: ${_param:cluster_name}
   # Apply setting from contexts/ceph/nautilus-multiple-osd.yml
   ceph_enabled: 'True'
   ceph_version: "nautilus"
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index 9b4bc0b..11a674c 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -133,16 +133,13 @@
   control_network_netmask: 255.255.255.0
   control_network_subnet: 10.167.4.0/24
   control_vlan: '10'
-  cookiecutter_template_branch: 'proposed'
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
+
   deploy_network_gateway: 10.167.5.1
   deploy_network_netmask: 255.255.255.0
   deploy_network_subnet: 10.167.5.0/24
   deployment_type: physical
   dns_server01: 172.18.176.6
   dns_server02: 172.18.224.6
-  email_address: test@mirantis.com
   gateway_primary_first_nic: eth1
   gateway_primary_second_nic: eth2
   gnocchi_aggregation_storage: ceph
@@ -168,7 +165,6 @@
   maas_deploy_network_name: deploy_network
   maas_deploy_range_end: 10.167.5.230
   maas_deploy_range_start: 10.167.5.20
-  maas_deploy_vlan: '0'
   maas_enabled: 'False'
   maas_fabric_name: deploy_fabric
   maas_hostname: cfg01
@@ -265,7 +261,6 @@
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
   version: proposed
-  vnf_onboarding_enabled: 'False'
   tenant_telemetry_enabled: 'True'
   openstack_telemetry_address: 10.167.4.83
   openstack_telemetry_hostname: mdb
@@ -301,7 +296,6 @@
   stacklight_telemetry_node02_hostname: mtr02
   stacklight_telemetry_node03_address: 10.167.4.99
   stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
   stacklight_long_term_storage_type: prometheus
   nova_vnc_tls_enabled: 'True'
   galera_ssl_enabled: 'True'
@@ -374,7 +368,6 @@
   octavia_manager_cluster: 'True'
   octavia_amphora_topology: 'ACTIVE_STANDBY'
   octavia_spare_amphora_pool_size: 0
-  octavia_hm_bind_ip: 192.168.10.12
   octavia_lb_mgmt_cidr: 192.168.10.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.10.2
   octavia_lb_mgmt_allocation_pool_end: 192.168.10.200
diff --git a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index 8655cb9..513d91c 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -80,16 +80,13 @@
   control_network_subnet: ==IPV4_NET_CONTROL_PREFIX==.0/24
   control_vlan: '10'
   tenant_vlan: '20'
-  cookiecutter_template_branch: ''
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
+
   deploy_network_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
   deploy_network_netmask: 255.255.255.0
   deploy_network_subnet: ==IPV4_NET_ADMIN_PREFIX==.0/24
   deployment_type: physical
   dns_server01: 172.18.176.6
   dns_server02: 172.18.224.6
-  email_address: sgudz@mirantis.com
   infra_bond_mode: active-backup
   infra_deploy_nic: eth0
   infra_kvm01_control_address: ==IPV4_NET_CONTROL_PREFIX==.241
@@ -115,7 +112,6 @@
   maas_deploy_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
   maas_deploy_range_end: ==IPV4_NET_ADMIN_PREFIX==.250
   maas_deploy_range_start: ==IPV4_NET_ADMIN_PREFIX==.240
-  maas_deploy_vlan: '0'
   maas_dhcp_enabled: 'False'
   maas_fabric_name: fabric-0
   maas_hostname: cfg01
@@ -233,7 +229,6 @@
   stacklight_telemetry_node02_hostname: mtr02
   stacklight_telemetry_node03_address: ==IPV4_NET_CONTROL_PREFIX==.88
   stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
   static_ips_on_deploy_network_enabled: 'False'
   tenant_network_gateway: ==IPV4_NET_TENANT_PREFIX==.220
   tenant_network_netmask: 255.255.255.0
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 210b5c8..9c033a0 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -121,16 +121,13 @@
   control_network_netmask: 255.255.255.0
   control_network_subnet: 10.167.4.0/24
   control_vlan: '10'
-  cookiecutter_template_branch: ''
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
+
   deploy_network_gateway: 10.167.5.1
   deploy_network_netmask: 255.255.255.0
   deploy_network_subnet: 10.167.5.0/24
   deployment_type: physical
   dns_server01: 172.18.176.6
   dns_server02: 172.18.224.6
-  email_address: test@mirantis.com
   gateway_primary_first_nic: eth1
   gateway_primary_second_nic: eth2
   gnocchi_aggregation_storage: ceph
@@ -152,14 +149,6 @@
   kubernetes_ctl_on_kvm: 'False'
   kubernetes_enabled: 'False'
   local_repositories: 'False'
-  maas_deploy_address: 10.167.5.15
-  maas_deploy_network_name: deploy_network
-  maas_deploy_range_end: 10.167.5.230
-  maas_deploy_range_start: 10.167.5.20
-  maas_deploy_vlan: '0'
-  maas_enabled: 'False'
-  maas_fabric_name: deploy_fabric
-  maas_hostname: cfg01
   mcp_common_scripts_branch: ''
   mcp_version: proposed
   mcp_docker_registry: docker-prod-local.docker.mirantis.net
@@ -254,7 +243,6 @@
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
   version: proposed
-  vnf_onboarding_enabled: 'False'
   openstack_telemetry_address: 10.167.4.83
   openstack_telemetry_hostname: mdb
   openstack_telemetry_node01_address: 10.167.4.84
@@ -289,7 +277,6 @@
   stacklight_telemetry_node02_hostname: mtr02
   stacklight_telemetry_node03_address: 10.167.4.99
   stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
   stacklight_long_term_storage_type: prometheus
   nova_vnc_tls_enabled: 'True'
   galera_ssl_enabled: 'True'
@@ -359,7 +346,6 @@
   octavia_health_manager_node03_address: 192.168.10.12
   octavia_manager_cluster: 'False'
   octavia_spare_amphora_pool_size: 0
-  octavia_hm_bind_ip: 192.168.10.12
   octavia_lb_mgmt_cidr: 192.168.10.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.10.2
   octavia_lb_mgmt_allocation_pool_end: 192.168.10.200
diff --git a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index 0908f81..8b6079a 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -83,17 +83,14 @@
   control_network_subnet: ==IPV4_NET_CONTROL_PREFIX==.0/24
   control_vlan: '10'
   tenant_vlan: '20'
-  cookiecutter_template_branch: ''
+
   jenkins_pipelines_branch: 'release/2019.2.0'
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
   deploy_network_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
   deploy_network_netmask: 255.255.255.0
   deploy_network_subnet: ==IPV4_NET_ADMIN_PREFIX==.0/24
   deployment_type: physical
   dns_server01: 172.18.176.6
   dns_server02: 172.18.224.6
-  email_address: test@mirantis.com
   infra_bond_mode: active-backup
   infra_deploy_nic: eth0
   infra_kvm01_control_address: ==IPV4_NET_CONTROL_PREFIX==.241
@@ -227,7 +224,6 @@
   stacklight_telemetry_node02_hostname: mtr02
   stacklight_telemetry_node03_address: ==IPV4_NET_CONTROL_PREFIX==.88
   stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
   static_ips_on_deploy_network_enabled: 'False'
   tenant_network_gateway: ==IPV4_NET_TENANT_PREFIX==.220
   tenant_network_netmask: 255.255.255.0
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index bd5305a..e8afbe8 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -132,16 +132,13 @@
   control_network_netmask: 255.255.255.0
   control_network_subnet: 10.167.4.0/24
   control_vlan: '10'
-  cookiecutter_template_branch: ''
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
+
   deploy_network_gateway: 10.167.5.1
   deploy_network_netmask: 255.255.255.0
   deploy_network_subnet: 10.167.5.0/24
   deployment_type: physical
   dns_server01: 172.18.176.6
   dns_server02: 172.18.224.6
-  email_address: test@mirantis.com
   gateway_primary_first_nic: eth1
   gateway_primary_second_nic: eth2
   gnocchi_aggregation_storage: ceph
@@ -167,7 +164,6 @@
   maas_deploy_network_name: deploy_network
   maas_deploy_range_end: 10.167.5.230
   maas_deploy_range_start: 10.167.5.20
-  maas_deploy_vlan: '0'
   maas_enabled: 'False'
   maas_fabric_name: deploy_fabric
   maas_hostname: cfg01
@@ -265,8 +261,6 @@
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
   version: proposed
-  vnf_onboarding_enabled: 'False'
-  tenant_telemetry_enabled: 'True'
   openstack_telemetry_address: 10.167.4.83
   openstack_telemetry_hostname: mdb
   openstack_telemetry_node01_address: 10.167.4.84
@@ -301,7 +295,6 @@
   stacklight_telemetry_node02_hostname: mtr02
   stacklight_telemetry_node03_address: 10.167.4.99
   stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
   stacklight_long_term_storage_type: prometheus
   nova_vnc_tls_enabled: 'True'
   galera_ssl_enabled: 'True'
@@ -374,7 +367,6 @@
   octavia_manager_cluster: 'True'
   octavia_amphora_topology: 'SINGLE'
   octavia_spare_amphora_pool_size: 1
-  octavia_hm_bind_ip: 192.168.10.12
   octavia_lb_mgmt_cidr: 192.168.10.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.10.2
   octavia_lb_mgmt_allocation_pool_end: 192.168.10.200