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 c8c9177..d0c621b 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -1,16 +1,15 @@
 classes:
 - system.etcd.server.cluster
-- service.kubernetes.control.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
 - system.keepalived.cluster.instance.kube_api_server_vip
-- system.linux.system.repo.docker
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
 - system.kubernetes.master.auth.rbac
 - system.kubernetes.control.roles.cluster-admin
 - system.kubernetes.control.roles.genie-pod-patch
-- cluster.k8s-ha-calico-flannel-virtlet.kubernetes.compute
-- cluster.k8s-ha-calico-flannel-virtlet
+- cluster.k8s-ha-calico-flannel-virtlet.kubernetes.common
+- cluster.k8s-ha-calico-flannel-virtlet.kubernetes.networking.virtual
+- cluster.k8s-ha-calico-flannel-virtlet.infra
 parameters:
   _param:
     keepalived_k8s_apiserver_vip_interface: ${_param:primary_interface}
@@ -23,38 +22,9 @@
           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}"}'
   kubernetes:
-    common:
-      addons:
-        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}
-        dns:
-          enabled: ${_param:kubernetes_dns}
-          kubedns_image: ${_param:kubernetes_kubedns_image}
-          dnsmasq_image: ${_param:kubernetes_dnsmasq_image}
-          sidecar_image: ${_param:kubernetes_sidecar_image}
-          autoscaler:
-            image: ${_param:kubernetes_dns_autoscaler_image}
-        coredns:
-          enabled: ${_param:kubernetes_coredns_enabled}
-        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
       kubelet:
         address: ${_param:single_address}
         fail_on_swap: ${_param:kubelet_fail_on_swap}
@@ -63,11 +33,10 @@
           enabled: true
       network:
         genie:
-          enabled: true
+          enabled: ${_param:kubernetes_genie_enabled}
           default_plugin: calico
-          image: ${_param:kubernetes_genie_image}
         flannel:
-          enabled: true
+          enabled: ${_param:kubernetes_flannel_enabled}
           private_ip_range: 10.20.0.0/16
         calico:
           enabled: true