diff --git a/classes/cluster/k8s-aio-calico/kubernetes/control.yml b/classes/cluster/k8s-aio-calico/kubernetes/control.yml
index d26942b..dc719bd 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/control.yml
@@ -1,5 +1,7 @@
 classes:
 - service.etcd.server.single
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server_single
 - system.salt.minion.cert.k8s_server_single
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml b/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
index 5923e3d..08791f1 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
@@ -1,5 +1,7 @@
 classes:
 - service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
 - system.haproxy.proxy.listen.kubernetes.apiserver
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/k8s-compact/kubernetes/control.yml b/classes/cluster/k8s-compact/kubernetes/control.yml
index 5564e9c..3a8012f 100644
--- a/classes/cluster/k8s-compact/kubernetes/control.yml
+++ b/classes/cluster/k8s-compact/kubernetes/control.yml
@@ -2,6 +2,8 @@
 - system.salt.minion.cert.etcd_server_single
 - system.salt.minion.cert.k8s_server_single
 - service.etcd.server.single
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
 - system.kubernetes.master.single
 - cluster.k8s-compact.kubernetes.compute
 parameters:
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
index 0d755a2..5144fe6 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
@@ -1,5 +1,7 @@
 classes:
 - service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
 - system.haproxy.proxy.listen.kubernetes.apiserver
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
index cc7a920..485b274 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
@@ -1,5 +1,7 @@
 classes:
 - service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
 - system.haproxy.proxy.listen.kubernetes.apiserver
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index 26a8608..f685589 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -1,5 +1,7 @@
 classes:
 - service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
 - system.haproxy.proxy.listen.kubernetes.apiserver
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index 8ef2041..78cd765 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -1,5 +1,7 @@
 classes:
 - service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
 - system.haproxy.proxy.listen.kubernetes.apiserver
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
index e2b9819..250d608 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
@@ -1,5 +1,7 @@
 classes:
 - service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
 - system.haproxy.proxy.listen.kubernetes.apiserver
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
index 0588b70..aea660b 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
@@ -1,5 +1,7 @@
 classes:
 - service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
 - system.haproxy.proxy.listen.kubernetes.apiserver
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 9797bb4..352aa0e 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -1,5 +1,7 @@
 classes:
 - service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
 - system.haproxy.proxy.listen.kubernetes.apiserver
 - system.linux.system.repo.mcp.apt_mirantis.docker_legacy
 - system.salt.minion.cert.etcd_server
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index d2210eb..ddfd347 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -1,5 +1,7 @@
 classes:
 - service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
 - system.haproxy.proxy.listen.kubernetes.apiserver
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server