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/model-manager/model_manager/dashboard.yml b/classes/cluster/model-manager/model_manager/dashboard.yml
index 6377ecd..db28c96 100644
--- a/classes/cluster/model-manager/model_manager/dashboard.yml
+++ b/classes/cluster/model-manager/model_manager/dashboard.yml
@@ -13,7 +13,7 @@
         protocol: http
         endpoint: internalURL
       source:
-        commit_id: 'd39884f86cb5517c2d058a6772abbb21f87baf73'
+        commit_id: '50cbdce293181e7c789815434f47397ffa526ec9'
   linux:
     network:
       interface:
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
index 67d9437..e4923a0 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
@@ -47,13 +47,6 @@
   _param:
     keepalived_vip_interface: ens4
     apache_manila_api_address: ${_param:cluster_local_address}
-  galera:
-    master:
-      innodb_buffer_pool_size: 1024M
-      max_connections: 1000
-    slave:
-      innodb_buffer_pool_size: 1024M
-      max_connections: 1000
   linux:
     system:
       package:
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
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
index d6ac994..0dade38 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
@@ -8,7 +8,6 @@
 - system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
 - system.linux.system.single
 - system.rsyslog.client.single
-- system.watchdog.server
 - system.prometheus.collector
 - system.telegraf.agent
 - system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-offline-pike-ovs/init.yml b/classes/cluster/virtual-offline-pike-ovs/init.yml
index 6671672..959ed0b 100644
--- a/classes/cluster/virtual-offline-pike-ovs/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/init.yml
@@ -8,7 +8,6 @@
 - system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
 - system.linux.system.single
 - system.rsyslog.client.single
-- system.watchdog.server
 - system.prometheus.collector
 - system.telegraf.agent
 - system.openssh.server.team.lab
diff --git a/classes/system b/classes/system
index 5b746c4..ad28e21 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 5b746c4d08ef1374fa57fdda6dfa7ea8104197e8
+Subproject commit ad28e212e503c42a20dd8ca7ebf2daaf22939dba