diff --git a/src/webui/grafana_dashboard_psql.json b/src/webui/grafana_db_mon_kpis_psql.json
similarity index 91%
rename from src/webui/grafana_dashboard_psql.json
rename to src/webui/grafana_db_mon_kpis_psql.json
index ec89c1647cc1086140b0bbd35354546c405ce910..750e5254ea1e4e689d92fc39cedd22a5ee619e03 100644
--- a/src/webui/grafana_dashboard_psql.json
+++ b/src/webui/grafana_db_mon_kpis_psql.json
@@ -33,7 +33,7 @@
       {
         "datasource": {
           "type": "postgres",
-          "uid": "questdb"
+          "uid": "questdb-mon-kpi"
         },
         "fieldConfig": {
           "defaults": {
@@ -162,14 +162,14 @@
           {
             "datasource": {
               "type": "postgres",
-              "uid": "questdb"
+              "uid": "questdb-mon-kpi"
             },
             "format": "time_series",
             "group": [],
             "hide": false,
             "metricColumn": "kpi_value",
             "rawQuery": true,
-            "rawSql": "SELECT\r\n  $__time(timestamp), kpi_value AS metric, device_name, endpoint_name, kpi_sample_type\r\nFROM\r\n  tfs_monitoring\r\nWHERE\r\n  $__timeFilter(timestamp) AND device_name IN (${device_name}) AND endpoint_name IN (${endpoint_name}) AND kpi_sample_type IN (${kpi_sample_type})\r\nGROUP BY\r\n  device_name, endpoint_name, kpi_sample_type\r\nORDER BY\r\n  timestamp",
+            "rawSql": "SELECT\r\n  $__time(timestamp), kpi_value AS metric, device_name, endpoint_name, kpi_sample_type\r\nFROM\r\n  tfs_monitoring_kpis\r\nWHERE\r\n  $__timeFilter(timestamp) AND device_name IN (${device_name}) AND endpoint_name IN (${endpoint_name}) AND kpi_sample_type IN (${kpi_sample_type})\r\nGROUP BY\r\n  device_name, endpoint_name, kpi_sample_type\r\nORDER BY\r\n  timestamp",
             "refId": "A",
             "select": [
               [
@@ -181,7 +181,7 @@
                 }
               ]
             ],
-            "table": "monitoring",
+            "table": "tfs_monitoring_kpis",
             "timeColumn": "timestamp",
             "where": [
               {
@@ -227,16 +227,16 @@
           },
           "datasource": {
             "type": "postgres",
-            "uid": "questdb"
+            "uid": "questdb-mon-kpi"
           },
-          "definition": "SELECT DISTINCT device_name FROM tfs_monitoring;",
+          "definition": "SELECT DISTINCT device_name FROM tfs_monitoring_kpis;",
           "hide": 0,
           "includeAll": true,
           "label": "Device",
           "multi": true,
           "name": "device_name",
           "options": [],
-          "query": "SELECT DISTINCT device_name FROM tfs_monitoring;",
+          "query": "SELECT DISTINCT device_name FROM tfs_monitoring_kpis;",
           "refresh": 2,
           "regex": "",
           "skipUrlSync": false,
@@ -255,16 +255,16 @@
           },
           "datasource": {
             "type": "postgres",
-            "uid": "questdb"
+            "uid": "questdb-mon-kpi"
           },
-          "definition": "SELECT DISTINCT endpoint_name FROM tfs_monitoring WHERE device_name IN (${device_name})",
+          "definition": "SELECT DISTINCT endpoint_name FROM tfs_monitoring_kpis WHERE device_name IN (${device_name})",
           "hide": 0,
           "includeAll": true,
           "label": "EndPoint",
           "multi": true,
           "name": "endpoint_name",
           "options": [],
-          "query": "SELECT DISTINCT endpoint_name FROM tfs_monitoring WHERE device_name IN (${device_name})",
+          "query": "SELECT DISTINCT endpoint_name FROM tfs_monitoring_kpis WHERE device_name IN (${device_name})",
           "refresh": 2,
           "regex": "",
           "skipUrlSync": false,
@@ -283,16 +283,16 @@
           },
           "datasource": {
             "type": "postgres",
-            "uid": "questdb"
+            "uid": "questdb-mon-kpi"
           },
-          "definition": "SELECT DISTINCT kpi_sample_type FROM tfs_monitoring;",
+          "definition": "SELECT DISTINCT kpi_sample_type FROM tfs_monitoring_kpis;",
           "hide": 0,
           "includeAll": true,
           "label": "Kpi Sample Type",
           "multi": true,
           "name": "kpi_sample_type",
           "options": [],
-          "query": "SELECT DISTINCT kpi_sample_type FROM tfs_monitoring;",
+          "query": "SELECT DISTINCT kpi_sample_type FROM tfs_monitoring_kpis;",
           "refresh": 2,
           "regex": "",
           "skipUrlSync": false,
@@ -308,7 +308,7 @@
     "timepicker": {},
     "timezone": "utc",
     "title": "L3 Monitoring",
-    "uid": "tf-l3-monit",
+    "uid": "tfs-l3-monit",
     "version": 6,
     "weekStart": ""
   }