diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index c556728..a408bbf 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -1,7 +1,6 @@
 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.kubernetes.pool.cluster
@@ -9,6 +8,7 @@
 - system.salt.minion.cert.etcd_client
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
+- system.kubernetes.control.roles.cluster-admin
 - cluster.k8s-ha-contrail-40.infra
 - cluster.overrides
 parameters: