diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/common.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/common.yml
index 7b286d0..9f3a471 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/common.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/common.yml
@@ -7,35 +7,6 @@
 parameters:
   kubernetes:
     common:
-      addons:
-        virtlet:
-          enabled: ${_param:kubernetes_virtlet_enabled}
-          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_compute01_hostname}
-        dashboard:
-          enabled: ${_param:kubernetes_dashboard}
-          image: ${_param:kubernetes_dashboard_image}
-        helm:
-          enabled: ${_param:kubernetes_helm_enabled}
-        netchecker:
-          enabled: ${_param:kubernetes_netchecker_enabled}
-          agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
-        externaldns:
-          enabled: ${_param:kubernetes_externaldns_enabled}
-          image: ${_param:kubernetes_externaldns_image}
-          provider: ${_param:kubernetes_externaldns_provider}
-        metallb:
-          enabled: ${_param:kubernetes_metallb_enabled}
-          addresses:
-          - ${_param:kubernetes_metallb_addresses_pool}
-        ingress-nginx:
-          enabled: ${_param:kubernetes_ingressnginx_enabled}
-        metrics-server:
-          enabled: ${_param:kubernetes_metrics_server_enabled}
       hyperkube:
         source: ${_param:kubernetes_hyperkube_source}
         source_hash: ${_param:kubernetes_hyperkube_source_hash}
@@ -44,9 +15,22 @@
       proxy:
         daemon_opts:
           cluster-cidr: ${_param:calico_private_network}/${_param:calico_private_netmask}
+      kubelet:
+        address: ${_param:single_address}
+        fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
+        genie:
+          enabled: ${_param:kubernetes_genie_enabled}
+          default_plugin: calico
+        flannel:
+          enabled: ${_param:kubernetes_flannel_enabled}
         calico:
+          enabled: True
           no_default_pools: False
+          image: ${_param:kubernetes_calico_image}
+          calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
+          cni_image: ${_param:kubernetes_calico_cni_image}
+          kube_controllers_image: ${_param:kubernetes_calico_kube_controllers_image}
           etcd:
             ssl:
               enabled: True
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
index b44d596..717be3c 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
@@ -3,27 +3,3 @@
 - cluster.k8s-ha-calico-flannel-virtlet.kubernetes.common
 - cluster.k8s-ha-calico-flannel-virtlet.kubernetes.networking.virtual
 - cluster.k8s-ha-calico-flannel-virtlet
-
-parameters:
-  kubernetes:
-    pool:
-      kubelet:
-        address: ${_param:single_address}
-        fail_on_swap: ${_param:kubelet_fail_on_swap}
-      network:
-        genie:
-          enabled: ${_param:kubernetes_genie_enabled}
-          default_plugin: calico
-        flannel:
-          enabled: ${_param:kubernetes_flannel_enabled}
-        calico:
-          enabled: true
-          image: ${_param:kubernetes_calico_image}
-          calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
-          cni_image: ${_param:kubernetes_calico_cni_image}
-          kube_controllers_image: ${_param:kubernetes_calico_kube_controllers_image}
-          etcd:
-            ssl:
-              enabled: true
-          policy:
-            enabled: ${_param:kubernetes_calico_policy_enabled}
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
index dcef5c1..06433b1 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -21,7 +21,39 @@
         calico:
           key: /calico/ipam/v2/assignment/ipv4/block/${_param:calico_private_network}-${_param:calico_private_netmask}
           value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
+      ssl:
+        enabled: true
   kubernetes:
+    common:
+      addons:
+        virtlet:
+          enabled: ${_param:kubernetes_virtlet_enabled}
+          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_compute01_hostname}
+        dashboard:
+          enabled: ${_param:kubernetes_dashboard}
+          image: ${_param:kubernetes_dashboard_image}
+        helm:
+          enabled: ${_param:kubernetes_helm_enabled}
+        netchecker:
+          enabled: ${_param:kubernetes_netchecker_enabled}
+          agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
+        externaldns:
+          enabled: ${_param:kubernetes_externaldns_enabled}
+          image: ${_param:kubernetes_externaldns_image}
+          provider: ${_param:kubernetes_externaldns_provider}
+        metallb:
+          enabled: ${_param:kubernetes_metallb_enabled}
+          addresses:
+          - ${_param:kubernetes_metallb_addresses_pool}
+        ingress-nginx:
+          enabled: ${_param:kubernetes_ingressnginx_enabled}
+        metrics-server:
+          enabled: ${_param:kubernetes_metrics_server_enabled}
     master:
       apiserver:
         insecure_address: 0.0.0.0
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/common.yml b/classes/cluster/k8s-ha-calico/kubernetes/common.yml
index 7b286d0..dc6ac4e 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/common.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/common.yml
@@ -7,35 +7,6 @@
 parameters:
   kubernetes:
     common:
-      addons:
-        virtlet:
-          enabled: ${_param:kubernetes_virtlet_enabled}
-          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_compute01_hostname}
-        dashboard:
-          enabled: ${_param:kubernetes_dashboard}
-          image: ${_param:kubernetes_dashboard_image}
-        helm:
-          enabled: ${_param:kubernetes_helm_enabled}
-        netchecker:
-          enabled: ${_param:kubernetes_netchecker_enabled}
-          agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
-        externaldns:
-          enabled: ${_param:kubernetes_externaldns_enabled}
-          image: ${_param:kubernetes_externaldns_image}
-          provider: ${_param:kubernetes_externaldns_provider}
-        metallb:
-          enabled: ${_param:kubernetes_metallb_enabled}
-          addresses:
-          - ${_param:kubernetes_metallb_addresses_pool}
-        ingress-nginx:
-          enabled: ${_param:kubernetes_ingressnginx_enabled}
-        metrics-server:
-          enabled: ${_param:kubernetes_metrics_server_enabled}
       hyperkube:
         source: ${_param:kubernetes_hyperkube_source}
         source_hash: ${_param:kubernetes_hyperkube_source_hash}
@@ -44,9 +15,17 @@
       proxy:
         daemon_opts:
           cluster-cidr: ${_param:calico_private_network}/${_param:calico_private_netmask}
+      kubelet:
+        address: ${_param:single_address}
+        fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
         calico:
+          enabled: True
           no_default_pools: False
+          image: ${_param:kubernetes_calico_image}
+          calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
+          cni_image: ${_param:kubernetes_calico_cni_image}
+          kube_controllers_image: ${_param:kubernetes_calico_kube_controllers_image}
           etcd:
             ssl:
               enabled: True
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index d99d0d3..8527ae0 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -3,21 +3,3 @@
 - cluster.k8s-ha-calico.kubernetes.common
 - cluster.k8s-ha-calico.kubernetes.networking.virtual
 - cluster.k8s-ha-calico
-parameters:
-  kubernetes:
-    pool:
-      kubelet:
-        address: ${_param:single_address}
-        fail_on_swap: ${_param:kubelet_fail_on_swap}
-      network:
-        calico:
-          enabled: true
-          image: ${_param:kubernetes_calico_image}
-          calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
-          cni_image: ${_param:kubernetes_calico_cni_image}
-          kube_controllers_image: ${_param:kubernetes_calico_kube_controllers_image}
-          etcd:
-            ssl:
-              enabled: true
-          policy:
-            enabled: ${_param:kubernetes_calico_policy_enabled}
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index 66289a5..c55e88d 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -20,7 +20,39 @@
         calico:
           key: /calico/ipam/v2/assignment/ipv4/block/${_param:calico_private_network}-${_param:calico_private_netmask}
           value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
+      ssl:
+        enabled: true
   kubernetes:
+    common:
+      addons:
+        virtlet:
+          enabled: ${_param:kubernetes_virtlet_enabled}
+          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_compute01_hostname}
+        dashboard:
+          enabled: ${_param:kubernetes_dashboard}
+          image: ${_param:kubernetes_dashboard_image}
+        helm:
+          enabled: ${_param:kubernetes_helm_enabled}
+        netchecker:
+          enabled: ${_param:kubernetes_netchecker_enabled}
+          agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
+        externaldns:
+          enabled: ${_param:kubernetes_externaldns_enabled}
+          image: ${_param:kubernetes_externaldns_image}
+          provider: ${_param:kubernetes_externaldns_provider}
+        metallb:
+          enabled: ${_param:kubernetes_metallb_enabled}
+          addresses:
+          - ${_param:kubernetes_metallb_addresses_pool}
+        ingress-nginx:
+          enabled: ${_param:kubernetes_ingressnginx_enabled}
+        metrics-server:
+          enabled: ${_param:kubernetes_metrics_server_enabled}
     master:
       apiserver:
         insecure_address: 0.0.0.0