diff --git a/classes/cluster/sl_k8s_calico/stacklight/client.yml b/classes/cluster/sl_k8s_calico/stacklight/client.yml
index 393449c..8c93be1 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/client.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/client.yml
@@ -1,9 +1,9 @@
 classes:
-- system.docker.client
 - system.elasticsearch.client.single
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
+- cluster.sl_k8s_calico
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/client.yml b/classes/cluster/sl_k8s_contrail/stacklight/client.yml
index 393449c..001d1bd 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/client.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/client.yml
@@ -1,9 +1,9 @@
 classes:
-- system.docker.client
 - system.elasticsearch.client.single
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
+- cluster.sl_k8s_contrail
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/sl_os_contrail/stacklight/client.yml b/classes/cluster/sl_os_contrail/stacklight/client.yml
index d7067d3..efca433 100755
--- a/classes/cluster/sl_os_contrail/stacklight/client.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/client.yml
@@ -1,5 +1,4 @@
 classes:
-- system.docker.client
 - system.elasticsearch.client.single
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
diff --git a/classes/cluster/sl_os_ovs/stacklight/client.yml b/classes/cluster/sl_os_ovs/stacklight/client.yml
index 393449c..3f8a5e0 100644
--- a/classes/cluster/sl_os_ovs/stacklight/client.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/client.yml
@@ -1,9 +1,9 @@
 classes:
-- system.docker.client
 - system.elasticsearch.client.single
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
+- cluster.sl_os_ovs
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters