diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index f8f568b..3f1d2c3 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -1,11 +1,11 @@
 classes:
 - system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
+- system.linux.network.hosts
 - system.salt.minion.cert.k8s_client
 - system.salt.minion.cert.etcd_client
-- cluster.virtual-mcp11-k8s-contrail.infra
 - cluster.virtual-mcp11-k8s-contrail.opencontrail.compute
-- cluster.overrides
+- cluster.virtual-mcp11-k8s-contrail
 parameters:
   linux:
     network:
@@ -14,6 +14,7 @@
           enabled: true
           type: eth
           proto: manual
+          ipflush_onchange: true
         vhost0:
           enabled: true
           type: eth
@@ -34,6 +35,7 @@
   kubernetes:
     pool:
       kubelet:
+        address: ${_param:single_address}
         fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
         opencontrail:
@@ -46,12 +48,11 @@
       addons:
         virtlet:
           enabled: ${_param:kubernetes_virtlet_enabled}
-          namespace: kube-system
+          namespace: ${_param:kubernetes_addon_namespace}
           image: ${_param:kubernetes_virtlet_image}
           criproxy_version: ${_param:kubernetes_criproxy_version}
           criproxy_source: ${_param:kubernetes_criproxy_checksum}
           hosts:
-          - ${_param:kubernetes_compute_node01_hostname}
-          - ${_param:kubernetes_compute_node02_hostname}
+          - ${linux:system:name}
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}