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 a07c16b..e6cb220 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
@@ -628,7 +628,6 @@
             power_user: ==IPMI_USER==
   mcp_version: proposed
   mcp_docker_registry: docker-prod-local.docker.mirantis.net
-  mcp_common_scripts_branch: ''
   offline_deployment: 'False'
   opencontrail_enabled: 'False'
   openldap_domain: bm-cicd-pike-ovs-maas.local
@@ -706,7 +705,6 @@
   cinder_version: ${_param:openstack_version}
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
-  publication_method: email
   salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
   salt_api_password_hash: $6$qdIFillN$XnzP7oIXRcbroVch7nlthyrSekjKlWND8q2MtoMF3Wz2ymepjAOjyqpyR55nmbH9OQzS8EcQJ6sfr5hWKDesV1
   salt_master_address: 10.167.11.5
@@ -825,8 +823,6 @@
   openstack_public_neutron_subnet_allocation_end: 172.17.42.55
   backend_vlan: '2402'
   storage_vlan: '2405'  # not implemented yet, placeholder
-  kqueen_custom_mail_enabled: 'False'
-  kqueen_enabled: 'False'
   manila_enabled: 'False'
   openscap_enabled: 'True'
   octavia_health_manager_node01_address: 192.168.1.10
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 84a4633..b83e16f 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
@@ -643,7 +643,6 @@
             power_user: ==IPMI_USER==
   mcp_version: proposed
   mcp_docker_registry: docker-prod-local.docker.mirantis.net
-  mcp_common_scripts_branch: ''
   offline_deployment: 'False'
   opencontrail_enabled: 'False'
   openldap_domain: bm-cicd-queens-ovs-maas.local
@@ -709,7 +708,6 @@
   openstack_nova_compute_reserved_host_memory_mb: '900'
   openstack_ovs_dvr_enabled: 'True'
   openstack_ovs_encapsulation_type: vxlan
-  ironic_vlan_range: 2402:2402
   openstack_proxy_address: 10.167.11.80
   openstack_proxy_hostname: prx
   openstack_proxy_node01_address: 10.167.11.81
@@ -721,7 +719,6 @@
   cinder_version: ${_param:openstack_version}
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
-  publication_method: email
   salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
   salt_api_password_hash: $6$qdIFillN$XnzP7oIXRcbroVch7nlthyrSekjKlWND8q2MtoMF3Wz2ymepjAOjyqpyR55nmbH9OQzS8EcQJ6sfr5hWKDesV1
   salt_master_address: 10.167.11.5
@@ -850,8 +847,6 @@
   openstack_public_neutron_subnet_allocation_end: 172.17.42.55
   backend_vlan: '2402'
   storage_vlan: '2405'  # not implemented yet, placeholder
-  kqueen_custom_mail_enabled: 'False'
-  kqueen_enabled: 'False'
   manila_enabled: 'False'
   openscap_enabled: 'True'
   octavia_health_manager_node01_address: 192.168.1.10
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 695b947..b8024a6 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
@@ -10,7 +10,6 @@
   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-odl-maas.local
   cluster_name: bm-e7-cicd-pike-odl-maas
   compute_bond_mode: active-backup
@@ -254,7 +253,6 @@
 
   mcp_version: proposed
   mcp_docker_registry: docker-prod-local.docker.mirantis.net
-  mcp_common_scripts_branch: ''
   offline_deployment: 'False'
   opencontrail_enabled: 'False'
   openldap_domain: bm-e7-cicd-pike-odl-maas.local
@@ -332,7 +330,6 @@
   cinder_version: ${_param:openstack_version}
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
-  publication_method: email
   salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
   salt_api_password_hash: $6$qdIFillN$XnzP7oIXRcbroVch7nlthyrSekjKlWND8q2MtoMF3Wz2ymepjAOjyqpyR55nmbH9OQzS8EcQJ6sfr5hWKDesV1
   salt_master_address: 172.16.162.66
@@ -413,8 +410,6 @@
   openstack_public_neutron_subnet_allocation_end: 172.17.42.112
   backend_vlan: '2402'
   storage_vlan: '2405'  # not implemented yet, placeholder
-  kqueen_custom_mail_enabled: 'False'
-  kqueen_enabled: 'False'
   manila_enabled: 'False'
   openscap_enabled: 'True'
   octavia_health_manager_node01_address: 192.168.1.10
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 f908804..957a961 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,7 +10,6 @@
   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
@@ -254,7 +253,6 @@
 
   mcp_version: proposed
   mcp_docker_registry: docker-prod-local.docker.mirantis.net
-  mcp_common_scripts_branch: ''
   offline_deployment: 'False'
   opencontrail_enabled: 'False'
   openldap_domain: bm-e7-cicd-pike-ovs-maas.local
@@ -332,7 +330,6 @@
   cinder_version: ${_param:openstack_version}
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
-  publication_method: email
   salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
   salt_api_password_hash: $6$qdIFillN$XnzP7oIXRcbroVch7nlthyrSekjKlWND8q2MtoMF3Wz2ymepjAOjyqpyR55nmbH9OQzS8EcQJ6sfr5hWKDesV1
   salt_master_address: 172.16.162.66
@@ -413,8 +410,6 @@
   openstack_public_neutron_subnet_allocation_end: 172.17.42.112
   backend_vlan: '2402'
   storage_vlan: '2405'  # not implemented yet, placeholder
-  kqueen_custom_mail_enabled: 'False'
-  kqueen_enabled: 'False'
   manila_enabled: 'False'
   openscap_enabled: 'True'
   octavia_health_manager_node01_address: 192.168.1.10
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 57665ec..5507f1d 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
@@ -72,7 +72,6 @@
   cluster_domain: heat-bm-cicd-pike-contrail-sl.local
   cluster_name: heat-bm-cicd-pike-contrail-sl
   opencontrail_version: 4.1
-  linux_repo_contrail_component: oc41
   compute_bond_mode: active-backup
   compute_padding_with_zeros: 'True'
   compute_primary_first_nic: eth1
@@ -116,8 +115,6 @@
   infra_primary_first_nic: eth1
   infra_primary_second_nic: eth2
   internal_proxy_enabled: 'False'
-  kqueen_custom_mail_enabled: 'False'
-  kqueen_enabled: 'False'
   kubernetes_enabled: 'False'
   local_repositories: 'False'
   maas_enabled: 'True'
@@ -692,7 +689,6 @@
             power_pass: ==IPMI_PASS==
             power_type: ipmi
             power_user: ==IPMI_USER==
-  mcp_common_scripts_branch: ''
   mcp_docker_registry: docker-prod-local.docker.mirantis.net
   mcp_version: proposed
   offline_deployment: 'False'
@@ -770,7 +766,6 @@
   openstack_version: pike
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
-  publication_method: email
   salt_api_password: BNRhXeGFdgVNx0Ikm2CAMw7eyeHf4grH
   salt_api_password_hash: $6$jriFnsbZ$eon54Ts/Kn4ywKpexe/W8srpBF64cxr2D8jd0RzTH8zdZVjS3viYt64m1d1VlXenurwpcGLkGzaGmOI0dlOox0
   salt_master_address: ==IPV4_NET_CONTROL_PREFIX==.15
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 8b99955..b0d3413 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
@@ -72,7 +72,6 @@
   cluster_domain: heat-bm-cicd-queens-contrail-sl.local
   cluster_name: heat-bm-cicd-queens-contrail-sl
   opencontrail_version: 4.1
-  linux_repo_contrail_component: oc41
   compute_bond_mode: active-backup
   compute_padding_with_zeros: 'True'
   compute_primary_first_nic: eth1
@@ -116,8 +115,6 @@
   infra_primary_first_nic: eth1
   infra_primary_second_nic: eth2
   internal_proxy_enabled: 'False'
-  kqueen_custom_mail_enabled: 'False'
-  kqueen_enabled: 'False'
   kubernetes_enabled: 'False'
   local_repositories: 'False'
   maas_enabled: 'True'
@@ -692,7 +689,6 @@
             power_pass: ==IPMI_PASS==
             power_type: ipmi
             power_user: ==IPMI_USER==
-  mcp_common_scripts_branch: ''
   mcp_docker_registry: docker-prod-local.docker.mirantis.net
   mcp_version: proposed
   offline_deployment: 'False'
@@ -770,7 +766,6 @@
   openstack_version: queens
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
-  publication_method: email
   salt_api_password: BNRhXeGFdgVNx0Ikm2CAMw7eyeHf4grH
   salt_api_password_hash: $6$jriFnsbZ$eon54Ts/Kn4ywKpexe/W8srpBF64cxr2D8jd0RzTH8zdZVjS3viYt64m1d1VlXenurwpcGLkGzaGmOI0dlOox0
   salt_master_address: ==IPV4_NET_CONTROL_PREFIX==.15
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 d16b4bf..fdc9485 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
@@ -2,7 +2,6 @@
   jenkins_cfg_admin_password: r00tme
   auditd_enabled: 'False'
   backend_network_netmask: 255.255.255.0
-  backend_network_subnet: 10.167.4.0/24
   backend_vlan: '10'
   backup_private_key: |-
     -----BEGIN RSA PRIVATE KEY-----
@@ -163,7 +162,6 @@
   maas_enabled: 'False'
   maas_fabric_name: deploy_fabric
   maas_hostname: cfg01
-  mcp_common_scripts_branch: 'proposed'
   mcp_docker_registry: docker-prod-local.docker.mirantis.net
   mcp_version: proposed
   no_platform: 'False'
@@ -178,8 +176,6 @@
   openstack_cluster_size: compact
   openstack_compute_count: '2'
   openstack_compute_rack01_hostname: cmp
-  openstack_compute_rack01_single_subnet: 10.167.4
-  openstack_compute_rack01_tenant_subnet: 10.167.6
   openstack_compute_single_address_ranges: 10.167.4.101-10.167.4.102
   openstack_compute_deploy_address_ranges: 10.167.5.73-10.167.5.74
   openstack_compute_tenant_address_ranges: 10.167.6.101-10.167.6.102
@@ -241,7 +237,6 @@
   openstack_version: pike
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
-  publication_method: email
   salt_api_password: BX7ium4MaRPIWBdyhj4LTbiedwg3yLep
   salt_api_password_hash: $6$qYqzkiRP$MiqA5ZMfsmdXJcuTTyeCgNPv9CBGO5nSH4HwRKPGUh0MFXcEa8JDCUEtS8xLHCkol7CMdq.l6CG7of0iaUJ.u.
   salt_master_address: 10.167.4.15
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 0311062..3f99b08 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
@@ -72,7 +72,6 @@
   cluster_domain: heat-cicd-queens-contrail41-sl.local
   cluster_name: heat-cicd-queens-contrail41-sl
   opencontrail_version: 4.1
-  linux_repo_contrail_component: oc41
   compute_bond_mode: active-backup
   compute_padding_with_zeros: 'True'
   compute_primary_first_nic: eth1
@@ -104,12 +103,9 @@
   infra_primary_first_nic: eth1
   infra_primary_second_nic: eth2
   internal_proxy_enabled: 'False'
-  kqueen_custom_mail_enabled: 'False'
-  kqueen_enabled: 'False'
   kubernetes_enabled: 'False'
   local_repositories: 'False'
   maas_enabled: 'False'
-  mcp_common_scripts_branch: ''
   mcp_docker_registry: docker-prod-local.docker.mirantis.net
   mcp_version: proposed
   offline_deployment: 'False'
@@ -191,7 +187,6 @@
   openstack_version: queens
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
-  publication_method: email
   salt_api_password: BNRhXeGFdgVNx0Ikm2CAMw7eyeHf4grH
   salt_api_password_hash: $6$jriFnsbZ$eon54Ts/Kn4ywKpexe/W8srpBF64cxr2D8jd0RzTH8zdZVjS3viYt64m1d1VlXenurwpcGLkGzaGmOI0dlOox0
   salt_master_address: ==IPV4_NET_CONTROL_PREFIX==.15
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 11a674c..99b442b 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
@@ -3,7 +3,6 @@
   jenkins_cfg_admin_password: r00tme
   auditd_enabled: 'False'
   backend_network_netmask: 255.255.255.0
-  backend_network_subnet: 10.167.4.0/24
   backend_vlan: '10'
   backup_private_key: |-
     -----BEGIN RSA PRIVATE KEY-----
@@ -168,7 +167,6 @@
   maas_enabled: 'False'
   maas_fabric_name: deploy_fabric
   maas_hostname: cfg01
-  mcp_common_scripts_branch: 'proposed'
   mcp_docker_registry: docker-prod-local.docker.mirantis.net
   mcp_version: proposed
   no_platform: 'False'
@@ -183,8 +181,6 @@
   openstack_cluster_size: compact
   openstack_compute_count: '2'
   openstack_compute_rack01_hostname: cmp
-  openstack_compute_rack01_single_subnet: 10.167.4
-  openstack_compute_rack01_tenant_subnet: 10.167.6
   openstack_compute_single_address_ranges: 10.167.4.101-10.167.4.102
   openstack_compute_deploy_address_ranges: 10.167.5.73-10.167.5.74
   openstack_compute_tenant_address_ranges: 10.167.6.101-10.167.6.102
@@ -246,7 +242,6 @@
   openstack_version: queens
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
-  publication_method: email
   salt_api_password: BX7ium4MaRPIWBdyhj4LTbiedwg3yLep
   salt_api_password_hash: $6$qYqzkiRP$MiqA5ZMfsmdXJcuTTyeCgNPv9CBGO5nSH4HwRKPGUh0MFXcEa8JDCUEtS8xLHCkol7CMdq.l6CG7of0iaUJ.u.
   salt_master_address: 10.167.4.15
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 513d91c..e1ff1fb 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
@@ -70,7 +70,6 @@
   cluster_domain: released-heat-cicd-pike-contrail41-sl.local
   cluster_name: released-heat-cicd-pike-contrail41-sl
   opencontrail_version: 4.1
-  linux_repo_contrail_component: oc41
   compute_bond_mode: active-backup
   compute_padding_with_zeros: 'True'
   compute_primary_first_nic: eth1
@@ -102,8 +101,6 @@
   infra_primary_first_nic: eth1
   infra_primary_second_nic: eth2
   internal_proxy_enabled: 'False'
-  kqueen_custom_mail_enabled: 'False'
-  kqueen_enabled: 'False'
   kubernetes_enabled: 'False'
   local_repositories: 'False'
   maas_enabled: 'True'
@@ -116,7 +113,6 @@
   maas_fabric_name: fabric-0
   maas_hostname: cfg01
   maas_manage_deploy_network: 'True'
-  mcp_common_scripts_branch: ''
   mcp_version: proposed
   mcp_docker_registry: docker-prod-local.docker.mirantis.net
   offline_deployment: 'False'
@@ -197,7 +193,6 @@
   openstack_version: pike
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
-  publication_method: email
   salt_api_password: BNRhXeGFdgVNx0Ikm2CAMw7eyeHf4grH
   salt_api_password_hash: $6$jriFnsbZ$eon54Ts/Kn4ywKpexe/W8srpBF64cxr2D8jd0RzTH8zdZVjS3viYt64m1d1VlXenurwpcGLkGzaGmOI0dlOox0
   salt_master_address: ==IPV4_NET_CONTROL_PREFIX==.15
@@ -235,9 +230,6 @@
   tenant_network_subnet: ==IPV4_NET_TENANT_PREFIX==.0/24
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
-  openldap_domain: released-heat-cicd-pike-contrail41-sl.local
-  openldap_enabled: 'True'
-  openldap_organisation: ${_param:cluster_name}
   ceph_enabled: 'True'
     # Apply setting from contexts/ceph/nautilus-multiple-osd.yml
   ceph_version: "nautilus"
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 9c033a0..4adf981 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
@@ -1,7 +1,6 @@
 default_context:
   auditd_enabled: 'False'
   backend_network_netmask: 255.255.255.0
-  backend_network_subnet: 10.167.4.0/24
   backend_vlan: '10'
   backup_private_key: |-
     -----BEGIN RSA PRIVATE KEY-----
@@ -149,7 +148,6 @@
   kubernetes_ctl_on_kvm: 'False'
   kubernetes_enabled: 'False'
   local_repositories: 'False'
-  mcp_common_scripts_branch: ''
   mcp_version: proposed
   mcp_docker_registry: docker-prod-local.docker.mirantis.net
   no_platform: 'False'
@@ -164,8 +162,6 @@
   openstack_cluster_size: compact
   openstack_compute_count: '2'
   openstack_compute_rack01_hostname: cmp
-  openstack_compute_rack01_single_subnet: 10.167.4
-  openstack_compute_rack01_tenant_subnet: 10.167.6
   openstack_compute_single_address_ranges: 10.167.4.101-10.167.4.102
   openstack_compute_deploy_address_ranges: 10.167.5.73-10.167.5.74
   openstack_compute_tenant_address_ranges: 10.167.6.101-10.167.6.102
@@ -227,7 +223,6 @@
   openstack_version: pike
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
-  publication_method: email
   salt_api_password: BX7ium4MaRPIWBdyhj4LTbiedwg3yLep
   salt_api_password_hash: $6$qYqzkiRP$MiqA5ZMfsmdXJcuTTyeCgNPv9CBGO5nSH4HwRKPGUh0MFXcEa8JDCUEtS8xLHCkol7CMdq.l6CG7of0iaUJ.u.
   salt_master_address: 10.167.4.15
@@ -358,7 +353,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
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 8b6079a..977e30d 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
@@ -73,7 +73,6 @@
   cluster_domain: released-heat-cicd-queens-contrail41-sl.local
   cluster_name: released-heat-cicd-queens-contrail41-sl
   opencontrail_version: 4.1
-  linux_repo_contrail_component: oc41
   compute_bond_mode: active-backup
   compute_padding_with_zeros: 'True'
   compute_primary_first_nic: eth1
@@ -106,12 +105,9 @@
   infra_primary_first_nic: eth1
   infra_primary_second_nic: eth2
   internal_proxy_enabled: 'False'
-  kqueen_custom_mail_enabled: 'False'
-  kqueen_enabled: 'False'
   kubernetes_enabled: 'False'
   local_repositories: 'False'
   maas_enabled: 'False'
-  mcp_common_scripts_branch: ''
   mcp_docker_registry: docker-prod-local.docker.mirantis.net
   mcp_version: proposed
   offline_deployment: 'False'
@@ -192,7 +188,6 @@
   openstack_version: queens
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
-  publication_method: email
   salt_api_password: BNRhXeGFdgVNx0Ikm2CAMw7eyeHf4grH
   salt_api_password_hash: $6$jriFnsbZ$eon54Ts/Kn4ywKpexe/W8srpBF64cxr2D8jd0RzTH8zdZVjS3viYt64m1d1VlXenurwpcGLkGzaGmOI0dlOox0
   salt_master_address: ==IPV4_NET_CONTROL_PREFIX==.15
@@ -230,9 +225,6 @@
   tenant_network_subnet: ==IPV4_NET_TENANT_PREFIX==.0/24
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
-  openldap_domain: ${_param:cluster_name}.local
-  openldap_enabled: 'True'
-  openldap_organisation: ${_param:cluster_name}
   ceph_enabled: 'True'
   ceph_version: "luminous"
   ceph_hyper_converged: "False"
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 e8afbe8..d358016 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
@@ -4,7 +4,6 @@
   jenkins_slave_type: 'ssh'
   auditd_enabled: 'False'
   backend_network_netmask: 255.255.255.0
-  backend_network_subnet: 10.167.4.0/24
   backend_vlan: '10'
   backup_private_key: |-
     -----BEGIN RSA PRIVATE KEY-----
@@ -167,7 +166,6 @@
   maas_enabled: 'False'
   maas_fabric_name: deploy_fabric
   maas_hostname: cfg01
-  mcp_common_scripts_branch: ''
   mcp_docker_registry: docker-prod-local.docker.mirantis.net
   mcp_version: proposed
   no_platform: 'False'
@@ -182,8 +180,6 @@
   openstack_cluster_size: compact
   openstack_compute_count: '2'
   openstack_compute_rack01_hostname: cmp
-  openstack_compute_rack01_single_subnet: 10.167.4
-  openstack_compute_rack01_tenant_subnet: 10.167.6
   openstack_compute_single_address_ranges: 10.167.4.101-10.167.4.102
   openstack_compute_deploy_address_ranges: 10.167.5.73-10.167.5.74
   openstack_compute_tenant_address_ranges: 10.167.6.101-10.167.6.102
@@ -245,7 +241,6 @@
   openstack_version: queens
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
-  publication_method: email
   salt_api_password: BX7ium4MaRPIWBdyhj4LTbiedwg3yLep
   salt_api_password_hash: $6$qYqzkiRP$MiqA5ZMfsmdXJcuTTyeCgNPv9CBGO5nSH4HwRKPGUh0MFXcEa8JDCUEtS8xLHCkol7CMdq.l6CG7of0iaUJ.u.
   salt_master_address: 10.167.4.15