diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
index 447ac9c..a78fce2 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
@@ -3,10 +3,10 @@
 - system.opencontrail.compute.cluster
 - system.opencontrail.client.cluster
 - system.opencontrail.client.resource.virtual_router
-- system.opencontrail.client.resource.k8s_api
 - system.opencontrail.compute.cluster4_0
 - cluster.k8s-ha-contrail-40.infra
 - cluster.k8s-ha-contrail-40.opencontrail
+- cluster.overrides
 
 parameters:
   _param:
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
index c76cc57..2045011 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
@@ -2,7 +2,7 @@
 - system.linux.system.lowmem
 - system.linux.system.repo.cassandra
 - system.linux.system.repo.mcp.contrail
-- system.linux.system.repo.mcp.openstack
+# - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.opencontrail.client.resource.edge_router
@@ -13,9 +13,11 @@
 - system.opencontrail.client.resource.database_node
 - system.opencontrail.client.resource.analytics_node
 - system.opencontrail.client.resource.global_vrouter_config
+- system.opencontrail.client.resource.k8s_api
 - system.haproxy.proxy.listen.opencontrail.analytics
 - cluster.k8s-ha-contrail-40.infra
 - cluster.k8s-ha-contrail-40.opencontrail
+- cluster.overrides
 
 parameters:
   _param:
@@ -39,6 +41,12 @@
   opencontrail:
     compute:
       enabled: false
+      version: ${_param:opencontrail_version}
+      disable_flow_collection: true
+      interface:
+        dev: ens4
+        address: None
+        mtu: 1500
     common:
       identity:
         host: none
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
index 0e57868..3a29757 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
@@ -6,7 +6,7 @@
     opencontrail_control_node02_hostname: ctl02
     opencontrail_control_node03_hostname: ctl03
 
-    opencontrail_control_address: 172.16.10.252
+    opencontrail_control_address: 172.16.10.253
     opencontrail_control_node01_address: 172.16.10.101
     opencontrail_control_node02_address: 172.16.10.102
     opencontrail_control_node03_address: 172.16.10.103