diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index f57d1ab..1e9913f 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -56,7 +56,6 @@
           namespace: ${_param:kubernetes_addon_namespace}
           image: ${_param:kubernetes_virtlet_image}
           hosts:
-          - ${_param:kubernetes_compute_node01_hostname}
-          - ${_param:kubernetes_compute_node02_hostname}
+          - ${linux:system:name}
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index 67b7254..685ea2a 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -35,7 +35,7 @@
           server_image: ${_param:kubernetes_netchecker_server_image}
         contrail_network_controller:
           namespace: ${_param:kubernetes_addon_namespace}
-          enabled: {_param:kubernetes_contrail_network_controller}
+          enabled: ${_param:kubernetes_contrail_network_controller}
           image: ${_param:kubernetes_contrail_network_controller_image}
     master:
       etcd: