diff --git a/classes/cluster/k8s-ha-contrail-40/infra/init.yml b/classes/cluster/k8s-ha-contrail-40/infra/init.yml
index 6254ab0..1c3004f 100644
--- a/classes/cluster/k8s-ha-contrail-40/infra/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/infra/init.yml
@@ -5,6 +5,7 @@
 - system.linux.system.repo.ubuntu
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
+- cluster.k8s-ha-contrail-40
 - cluster.k8s-ha-contrail-40.kubernetes
 - cluster.overrides
 
@@ -15,8 +16,6 @@
     infra_config_address: 172.16.10.100
     infra_config_deploy_address: 192.168.10.90
 
-    cluster_domain: k8s-ha-contrail-40.local
-    cluster_name: k8s-ha-contrail-40
     apt_mk_version: nightly
   linux:
     network:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index 2f3d81e..b9388c8 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -23,9 +23,7 @@
           enabled: true
           type: eth
           mtu: 1500
-          address: ${_param:deploy_address}
-          netmask: '255.255.255.0'
-          ipflush_onchange: true
+          proto: dhcp
 
         ens4:
           enabled: true
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
index 2045011..ee4cbbd 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
@@ -30,13 +30,6 @@
     cluster_node03_address: ${_param:opencontrail_control_node03_address}
     opencontrail_router01_hostname: vsrx01.${_param:cluster_domain}
     opencontrail_router01_address: 172.16.10.131
-  linux:
-    network:
-      interface:
-        eth1:
-          enabled: true
-          type: eth
-          proto: dhcp
 
   opencontrail:
     compute: