diff --git a/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/lab04-physical-inventory.yaml
index 67b5df4..d51f4b6 100644
--- a/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/lab04-physical-inventory.yaml
@@ -18,9 +18,11 @@
       - linux_system_codename_xenial
       interfaces:
         enp9s0f0:
-          role: single_mgm_dhcp
+          role: single_dhcp
         enp9s0f1:
           role: single_vlan_ctl
+        ens11f0:
+          role: single_mgm_manual_vlan
 
     kvm02.cookied-cicd-bm-k8s-contrail40-maas.local:
       reclass_storage_name: infra_kvm_node02
@@ -29,9 +31,11 @@
       - linux_system_codename_xenial
       interfaces:
         enp9s0f0:
-          role: single_mgm_dhcp
+          role: single_dhcp
         enp9s0f1:
           role: single_vlan_ctl
+        ens11f0:
+          role: single_mgm_manual_vlan
 
     kvm03.cookied-cicd-bm-k8s-contrail40-maas.local:
       reclass_storage_name: infra_kvm_node03
@@ -40,9 +44,11 @@
       - linux_system_codename_xenial
       interfaces:
         enp9s0f0:
-          role: single_mgm_dhcp
+          role: single_dhcp
         enp9s0f1:
           role: single_vlan_ctl
+        ens11f0:
+          role: single_mgm_manual_vlan
 
     ctl01.cookied-cicd-bm-k8s-contrail40-maas.local:
       reclass_storage_name: kubernetes_control_node01
@@ -86,7 +92,5 @@
       interfaces:
         enp9s0f0:
           role: single_dhcp
-        enp9s0f1:
-          role: single_vlan_ctl
         ens11f1:
-          role: bond0_ab_contrail
+          role: k8s_oc40_only_vhost_on_control_vlan
diff --git a/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/salt-context-cookiecutter-k8s-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/salt-context-cookiecutter-k8s-contrail.yaml
index 5e6f6f4..e2bbdb7 100644
--- a/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/salt-context-cookiecutter-k8s-contrail.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/salt-context-cookiecutter-k8s-contrail.yaml
@@ -106,12 +106,11 @@
   infra_kvm_vip_address: 10.167.13.240
   infra_primary_first_nic: eth1
   infra_primary_second_nic: eth2
-  internal_proxy_enabled: 'False'
   kubernetes_enabled: 'True'
   kubernetes_compute_count: 2
   kubernetes_compute_rack01_hostname: cmp
   kubernetes_compute_single_address_ranges: 10.167.13.103-10.167.13.104
-  kubernetes_compute_tenant_address_ranges: 10.167.14.103-10.167.14.104
+  kubernetes_compute_tenant_address_ranges: 10.167.13.103-10.167.13.104
   kubernetes_network_opencontrail_enabled: 'True'
   kubernetes_keepalived_vip_interface: br_ctl
   kubernetes_metallb_enabled: 'False'  # Not used with opencontrail
@@ -274,12 +273,6 @@
   kubernetes_control_node02_deploy_address: 172.17.41.11
   kubernetes_control_node03_address: 10.167.13.237
   kubernetes_control_node03_hostname: ctl03
-  kubernetes_proxy_hostname: prx
-  kubernetes_proxy_node01_hostname: prx01
-  kubernetes_proxy_node02_hostname: prx02
-  kubernetes_proxy_address: 10.167.13.80
-  kubernetes_proxy_node01_address: 10.167.13.81
-  kubernetes_proxy_node02_address: 10.167.13.82
   linux_repo_contrail_component: oc40
   opencontrail_analytics_hostname: ctl
   opencontrail_analytics_node01_hostname: ctl01
@@ -300,9 +293,9 @@
   opencontrail_control_node03_address: 10.167.13.237
   opencontrail_control_node03_hostname: ctl03
   opencontrail_enabled: 'True'
-  opencontrail_router01_address: 10.167.13.220
+  opencontrail_router01_address: 10.167.13.100
   opencontrail_router01_hostname: rtr01
-  opencontrail_router02_address: 10.167.13.221
+  opencontrail_router02_address: 10.167.13.101
   opencontrail_router02_hostname: rtr02
   opencontrail_public_ip_range: 172.17.41.128/26
   opencontrail_version: '4.0'
@@ -358,10 +351,10 @@
   stacklight_telemetry_node03_hostname: mtr03
   stacklight_version: '2'
   static_ips_on_deploy_network_enabled: 'False'
-  tenant_network_gateway: 10.167.14.253
+  tenant_network_gateway: 10.167.13.1
   tenant_network_netmask: 255.255.255.0
-  tenant_network_subnet: 10.167.14.0/24
-  tenant_vlan: '2411'
+  tenant_network_subnet: 10.167.13.0/24
+  tenant_vlan: '2410'
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
   vnf_onboarding_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/salt-context-environment.yaml b/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/salt-context-environment.yaml
index e9a7dda..5ef4e1b 100644
--- a/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/salt-context-environment.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/salt-context-environment.yaml
@@ -130,25 +130,3 @@
           role: single_dhcp
         ens3:
           role: single_ctl
-
-    prx01:
-      reclass_storage_name: kubernetes_proxy_node01
-      roles:
-      - kubernetes_proxy
-      - linux_system_codename_xenial
-      interfaces:
-        ens2:
-          role: single_dhcp
-        ens3:
-          role: single_ctl
-
-    prx02:
-      reclass_storage_name: kubernetes_proxy_node02
-      roles:
-      - kubernetes_proxy
-      - linux_system_codename_xenial
-      interfaces:
-        ens2:
-          role: single_dhcp
-        ens3:
-          role: single_ctl