diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
index a78fce2..4122fff 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
@@ -1,8 +1,5 @@
 classes:
 - system.linux.system.repo.mcp.contrail
-- system.opencontrail.compute.cluster
-- system.opencontrail.client.cluster
-- system.opencontrail.client.resource.virtual_router
 - system.opencontrail.compute.cluster4_0
 - cluster.k8s-ha-contrail-40.infra
 - cluster.k8s-ha-contrail-40.opencontrail
@@ -24,16 +21,7 @@
       network:
         engine: k8s
         host: none
-    client:
-      api:
-        host: ${_param:opencontrail_control_address}
-        port: 9100
-      identity:
-        engine: k8s
-        host: none
-        token: none
-        password: none
-        
+
   kubernetes:
     pool:
       network:
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
index ee4cbbd..4dfad76 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
@@ -2,7 +2,6 @@
 - 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.extra
 - system.linux.system.repo.saltstack.xenial
 - system.opencontrail.client.resource.edge_router
@@ -43,7 +42,7 @@
     common:
       identity:
         host: none
-        engine: k8s
+        engine: none
       network:
         engine: k8s
       contrainer_folders:
@@ -52,20 +51,23 @@
       - /var/lib/configdb
       - /var/lib/analyticsdb/
       - /usr/share/kafka/logs
+    collector:
+      identity:
+        engine: none
     config:
       network:
         engine: k8s
       identity:
-        engine: k8s
+        engine: none
         region: none
         host: none
       multi_tenancy: false
       message_queue:
         host: ${_param:opencontrail_control_address}
     web:
-      http: 
+      http:
         port: 8095
-      https: 
+      https:
         port: 8143
       network:
         engine: k8s