diff --git a/classes/cluster/sl_k8s_calico/stacklight/server.yml b/classes/cluster/sl_k8s_calico/stacklight/server.yml
index 17d6813..65f9dc4 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/server.yml
@@ -18,7 +18,7 @@
 - system.galera.server.cluster
 - system.galera.server.database.grafana
 - system.influxdb.server.single
-- system.influxdb.database.stacklight
+- system.influxdb.database.prometheus
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
@@ -62,7 +62,7 @@
     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_db: prometheus
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
   elasticsearch:
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/server.yml b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
index b5dbeac..a0dd997 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
@@ -18,7 +18,7 @@
 - system.glusterfs.server.cluster
 - system.glusterfs.server.volume.prometheus
 - system.influxdb.server.single
-- system.influxdb.database.stacklight
+- system.influxdb.database.prometheus
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
@@ -62,7 +62,7 @@
     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_db: prometheus
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
   elasticsearch:
diff --git a/classes/cluster/sl_os_contrail/stacklight/server.yml b/classes/cluster/sl_os_contrail/stacklight/server.yml
index 747ac71..d702151 100755
--- a/classes/cluster/sl_os_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/server.yml
@@ -17,7 +17,7 @@
 - system.haproxy.proxy.listen.stacklight.influxdb
 - service.haproxy.proxy.single
 - system.influxdb.server.single
-- system.influxdb.database.stacklight
+- system.influxdb.database.prometheus
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
 - system.prometheus.server.remote_write.docker
@@ -60,7 +60,7 @@
     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_db: prometheus
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
   linux:
@@ -71,4 +71,4 @@
           type: eth
           proto: static
           address: ${_param:single_address}
-          netmask: 255.255.255.0
\ No newline at end of file
+          netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
index 7cd5d90..a455c20 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
@@ -13,7 +13,7 @@
 - system.galera.server.cluster
 - system.galera.server.database.grafana
 - system.influxdb.server.single
-- system.influxdb.database.stacklight
+- system.influxdb.database.prometheus
 - system.salt.minion.cert.prometheus_server
 #- system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
@@ -58,7 +58,7 @@
     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_db: prometheus
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
   elasticsearch:
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 512e30e..be43047 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -18,7 +18,7 @@
 - system.haproxy.proxy.listen.stacklight.influxdb
 - service.haproxy.proxy.single
 - system.influxdb.server.single
-- system.influxdb.database.stacklight
+- system.influxdb.database.prometheus
 - system.influxdb.database.ceilometer
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
@@ -60,7 +60,7 @@
     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_db: prometheus
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
     remote_collector_telegraf_host: monitoring_remote_agent
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index 6417dbe..03bbc23 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -18,7 +18,7 @@
 - system.haproxy.proxy.listen.stacklight.influxdb
 - service.haproxy.proxy.single
 - system.influxdb.server.single
-- system.influxdb.database.stacklight
+- system.influxdb.database.prometheus
 - system.influxdb.database.ceilometer
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
@@ -60,7 +60,7 @@
     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_db: prometheus
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
     remote_collector_telegraf_host: monitoring_remote_agent
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
index 6e16380..f728b30 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
@@ -56,7 +56,7 @@
     grafana_database_password: ${_param:mysql_grafana_password}
     grafana_database_type: mysql
     prometheus_influxdb_url: "http://${_param:stacklight_address}:8086/"
-    prometheus_influxdb_db: lma
+    prometheus_influxdb_db: prometheus
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: lmapass
   keepalived:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index 0e92b98..1b6a8cd 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -18,7 +18,7 @@
 - system.galera.server.cluster
 - system.galera.server.database.grafana
 - system.influxdb.client
-- system.influxdb.client.database.stacklight
+- system.influxdb.client.database.prometheus
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
@@ -68,7 +68,7 @@
     influxdb_client_port: ${_param:influxdb_port}
     influxdb_client_password: ${_param:influxdb_admin_password}
     prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
-    prometheus_influxdb_db: lma
+    prometheus_influxdb_db: prometheus
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
     telegraf_remote_agent_influxdb_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index ea728de..8907d90 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -18,7 +18,7 @@
 - system.glusterfs.server.cluster
 - system.glusterfs.server.volume.prometheus
 - system.influxdb.server.single
-- system.influxdb.database.stacklight
+- system.influxdb.database.prometheus
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
@@ -62,7 +62,7 @@
     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_db: prometheus
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
   elasticsearch: