diff --git a/classes/cluster/sl_os_contrail/stacklight/server.yml b/classes/cluster/sl_os_contrail/stacklight/server.yml
index b8520de..747ac71 100755
--- a/classes/cluster/sl_os_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/server.yml
@@ -71,13 +71,4 @@
           type: eth
           proto: static
           address: ${_param:single_address}
-          netmask: 255.255.255.0
-  elasticsearch:
-    server:
-      heap:
-        size: 1
-  keepalived:
-    cluster:
-      instance:
-        VIP:
-          enabled: false
\ No newline at end of file
+          netmask: 255.255.255.0
\ No newline at end of file
diff --git a/classes/cluster/sl_os_ovs/stacklight/init.yml b/classes/cluster/sl_os_ovs/stacklight/init.yml
index 9621aa3..09481dc 100644
--- a/classes/cluster/sl_os_ovs/stacklight/init.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/init.yml
@@ -7,7 +7,6 @@
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
     stacklight_log_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-
     heka_elasticsearch_host: ${_param:stacklight_monitor_address}
     heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
     heka_aggregator_host: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/sl_os_ovs/stacklight/server.yml b/classes/cluster/sl_os_ovs/stacklight/server.yml
index 7053531..0ca8f90 100644
--- a/classes/cluster/sl_os_ovs/stacklight/server.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/server.yml
@@ -1,29 +1,21 @@
 classes:
-- cluster.sl_os_ovs
-- system.docker.host
-- system.linux.system.repo.glusterfs
+- system.collectd.remote_client.cluster
+- system.heka.remote_collector.cluster
 - system.linux.system.repo.influxdb
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.tcp_elastic
-- system.heka.remote_collector
 - system.heka.remote_collector.input.amqp
-- system.heka.remote_collector.output.elasticsearch
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.prometheus
+- system.heka.aggregator.cluster
+- system.linux.system.repo.tcp_elastic 
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
+- system.grafana.server.single
+- system.nagios.server.cluster
+- cluster.sl_os_ovs
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb
+- system.haproxy.proxy.listen.stacklight.grafana
 - service.haproxy.proxy.single
-- system.influxdb.server.single
-- system.influxdb.database.stacklight
-- system.keepalived.cluster.instance.prometheus_server_vip
-- system.telegraf.agent.remote
-- system.prometheus.server.remote_write.docker
-- system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.dns
+- system.keepalived.cluster.instance.stacklight_monitor_vip
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.dashboard
 parameters:
@@ -39,11 +31,10 @@
     cluster_kibana_port: 5601
     cluster_grafana_port: 3000
     cluster_node01_name: mon01
-    cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
     cluster_node01_address: ${_param:stacklight_monitor_node01_address}
-    cluster_node02_hostname: ${_param:stacklight_monitor_node02_hostname}
+    cluster_node02_name: mon02
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
-    cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
+    cluster_node03_name: mon03
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
     docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
@@ -51,19 +42,6 @@
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
     docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
     docker_image_grafana: grafana/grafana:4.3.2
-    grafana_admin_password: admin
-    kibana_elasticsearch_host: ${_param:cluster_vip_address}
-    openstack_version: newton
-    grafana_database_type: mysql
-    grafana_database_host: ${_param:cluster_vip_address}
-    grafana_database_password: ${_param:mysql_grafana_password}
-    influxdb_port: 8086
-    influxdb_admin_password: password
-    influxdb_stacklight_password: lmapass
-    prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
-    prometheus_influxdb_db: lma
-    prometheus_influxdb_username: lma
-    prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
   linux:
     network:
       interface:
@@ -73,12 +51,3 @@
           proto: static
           address: ${_param:single_address}
           netmask: 255.255.255.0
-  elasticsearch:
-    server:
-      heap:
-        size: 1
-  keepalived:
-    cluster:
-      instance:
-        VIP:
-          enabled: false