diff --git a/deploy/charts/openebs-monitoring/Chart.lock b/deploy/charts/openebs-monitoring/Chart.lock
index 32f3734..962a38a 100644
--- a/deploy/charts/openebs-monitoring/Chart.lock
+++ b/deploy/charts/openebs-monitoring/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: kube-prometheus-stack
   repository: https://prometheus-community.github.io/helm-charts
-  version: 15.4.6
-digest: sha256:c9eee73312750c692251c0cc01efd3751f558da6601631028bb6cc9628f7c3d0
-generated: "2021-05-25T09:22:08.698245551+05:30"
+  version: 16.5.0
+digest: sha256:3f089976c6d2865a11776b30c9acee90a82403ff49d56242a48f5a3182929f06
+generated: "2021-06-10T01:29:44.53240328+05:30"
diff --git a/deploy/charts/openebs-monitoring/Chart.yaml b/deploy/charts/openebs-monitoring/Chart.yaml
index 92ff57d..cbe53ac 100644
--- a/deploy/charts/openebs-monitoring/Chart.yaml
+++ b/deploy/charts/openebs-monitoring/Chart.yaml
@@ -34,7 +34,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.15
+version: 0.1.16
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -43,6 +43,6 @@ appVersion: 2.8.0
 
 dependencies:
   - name: kube-prometheus-stack
-    version: "15.4.*"
+    version: "16.5.*"
     repository: https://prometheus-community.github.io/helm-charts
     condition: kube-prometheus-stack.install
diff --git a/deploy/charts/openebs-monitoring/dashboards/Jiva/jiva-volumes.json b/deploy/charts/openebs-monitoring/dashboards/Jiva/jiva-volume.json
similarity index 99%
rename from deploy/charts/openebs-monitoring/dashboards/Jiva/jiva-volumes.json
rename to deploy/charts/openebs-monitoring/dashboards/Jiva/jiva-volume.json
index 2dc9431..1b74c28 100644
--- a/deploy/charts/openebs-monitoring/dashboards/Jiva/jiva-volumes.json
+++ b/deploy/charts/openebs-monitoring/dashboards/Jiva/jiva-volume.json
@@ -1046,7 +1046,8 @@
   "schemaVersion": 27,
   "style": "light",
   "tags": [
-    "OpenEBS"
+    "OpenEBS",
+    "Jiva"
   ],
   "templating": {
     "list": [
@@ -1265,7 +1266,7 @@
     ]
   },
   "timezone": "",
-  "title": "OpenEBS / Jiva / Volume dashboard",
+  "title": "OpenEBS / Jiva / Volume",
   "uid": "75acc0e8-3731-4b73-b343-0759d70f734a",
   "version": 1
-}
\ No newline at end of file
+}
diff --git a/deploy/charts/openebs-monitoring/dashboards/cStor/overview-dashboard.json b/deploy/charts/openebs-monitoring/dashboards/cStor/cStor-overview.json
similarity index 99%
rename from deploy/charts/openebs-monitoring/dashboards/cStor/overview-dashboard.json
rename to deploy/charts/openebs-monitoring/dashboards/cStor/cStor-overview.json
index c437649..0619917 100644
--- a/deploy/charts/openebs-monitoring/dashboards/cStor/overview-dashboard.json
+++ b/deploy/charts/openebs-monitoring/dashboards/cStor/cStor-overview.json
@@ -780,7 +780,10 @@
   "refresh": "",
   "schemaVersion": 27,
   "style": "dark",
-  "tags": [],
+  "tags": [
+    "OpenEBS",
+    "cStor"
+  ],
   "templating": {
     "list": [
       {
@@ -877,7 +880,7 @@
     ]
   },
   "timezone": "",
-  "title": "OpenEBS / cStor / Overview Dashboard",
+  "title": "OpenEBS / cStor / Overview",
   "uid": "96KrOYew1",
   "version": 11
-}
\ No newline at end of file
+}
diff --git a/deploy/charts/openebs-monitoring/dashboards/cStor/cstor-pool.json b/deploy/charts/openebs-monitoring/dashboards/cStor/cStor-pool.json
similarity index 99%
rename from deploy/charts/openebs-monitoring/dashboards/cStor/cstor-pool.json
rename to deploy/charts/openebs-monitoring/dashboards/cStor/cStor-pool.json
index 50a892f..23a1738 100644
--- a/deploy/charts/openebs-monitoring/dashboards/cStor/cstor-pool.json
+++ b/deploy/charts/openebs-monitoring/dashboards/cStor/cStor-pool.json
@@ -669,7 +669,10 @@
   "refresh": "1m",
   "schemaVersion": 27,
   "style": "dark",
-  "tags": ["OpenEBS"],
+  "tags": [
+    "OpenEBS",
+    "cStor"
+  ],
   "templating": {
     "list": [
       {
@@ -769,7 +772,7 @@
     "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
   },
   "timezone": "",
-  "title": "OpenEBS / cStor / Pool dashboard",
+  "title": "OpenEBS / cStor / Pool",
   "uid": "5a50cd9e-2013-4a58-8d06-669103eb9717",
   "version": 1
 }
diff --git a/deploy/charts/openebs-monitoring/dashboards/cStor/cstor-volume-replicas.json b/deploy/charts/openebs-monitoring/dashboards/cStor/cStor-volume-replica.json
similarity index 99%
rename from deploy/charts/openebs-monitoring/dashboards/cStor/cstor-volume-replicas.json
rename to deploy/charts/openebs-monitoring/dashboards/cStor/cStor-volume-replica.json
index f239760..edf10b5 100644
--- a/deploy/charts/openebs-monitoring/dashboards/cStor/cstor-volume-replicas.json
+++ b/deploy/charts/openebs-monitoring/dashboards/cStor/cStor-volume-replica.json
@@ -1242,7 +1242,10 @@
   "refresh": false,
   "schemaVersion": 27,
   "style": "light",
-  "tags": ["OpenEBS"],
+  "tags": [
+    "OpenEBS",
+    "cStor"
+  ],
   "templating": {
     "list": [
       {
@@ -1363,7 +1366,7 @@
     "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
   },
   "timezone": "",
-  "title": "OpenEBS / cStor / Volume Replicas dashboard",
+  "title": "OpenEBS / cStor / Volume Replica",
   "uid": "644d0435-03e1-4da3-b768-7968f526cf681",
   "version": 2
 }
diff --git a/deploy/charts/openebs-monitoring/dashboards/cStor/cstor-volumes.json b/deploy/charts/openebs-monitoring/dashboards/cStor/cStor-volume.json
similarity index 99%
rename from deploy/charts/openebs-monitoring/dashboards/cStor/cstor-volumes.json
rename to deploy/charts/openebs-monitoring/dashboards/cStor/cStor-volume.json
index e3530a9..bc3c4d9 100644
--- a/deploy/charts/openebs-monitoring/dashboards/cStor/cstor-volumes.json
+++ b/deploy/charts/openebs-monitoring/dashboards/cStor/cStor-volume.json
@@ -1044,7 +1044,8 @@
   "schemaVersion": 27,
   "style": "light",
   "tags": [
-    "OpenEBS"
+    "OpenEBS",
+    "cStor"
   ],
   "templating": {
     "list": [
@@ -1290,7 +1291,7 @@
     ]
   },
   "timezone": "",
-  "title": "OpenEBS / cStor/ Volume dashboard",
+  "title": "OpenEBS / cStor/ Volume",
   "uid": "f46a2d03-c2af-4954-b2b3-307c4d77bcaf",
   "version": 1
-}
\ No newline at end of file
+}