diff --git a/charts/osm/grafana/dashboards/osm-control-plane.json b/charts/osm/grafana/dashboards/osm-control-plane.json
index 777b7a2107..5cf2aa9534 100755
--- a/charts/osm/grafana/dashboards/osm-control-plane.json
+++ b/charts/osm/grafana/dashboards/osm-control-plane.json
@@ -20,7 +20,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "7.0.1"
+      "version": "8.2.2"
     },
     {
       "type": "panel",
@@ -132,7 +132,7 @@
           "dataLinks": []
         },
         "percentage": false,
-        "pluginVersion": "7.0.1",
+        "pluginVersion": "8.2.2",
         "pointradius": 2,
         "points": false,
         "renderer": "flot",
@@ -239,7 +239,7 @@
           "dataLinks": []
         },
         "percentage": false,
-        "pluginVersion": "7.0.1",
+        "pluginVersion": "8.2.2",
         "pointradius": 2,
         "points": false,
         "renderer": "flot",
@@ -341,7 +341,7 @@
         "options": {
           "dataLinks": []
         },
-        "pluginVersion": "7.0.1",
+        "pluginVersion": "8.2.2",
         "targets": [
           {
             "expr": "sum(envoy_cluster_upstream_cx_active{source_service=\"$source_service\",source_namespace=\"$source_namespace\",envoy_cluster_name=\"osm-controller\"})",
diff --git a/charts/osm/grafana/dashboards/osm-data-plane-container.json b/charts/osm/grafana/dashboards/osm-data-plane-container.json
index f47a063a62..4a143b5793 100644
--- a/charts/osm/grafana/dashboards/osm-data-plane-container.json
+++ b/charts/osm/grafana/dashboards/osm-data-plane-container.json
@@ -20,7 +20,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "7.0.1"
+      "version": "8.2.2"
     },
     {
       "type": "panel",
diff --git a/charts/osm/grafana/dashboards/osm-mesh-envoy-details.json b/charts/osm/grafana/dashboards/osm-mesh-envoy-details.json
index 3dde273025..734ba0e1e0 100644
--- a/charts/osm/grafana/dashboards/osm-mesh-envoy-details.json
+++ b/charts/osm/grafana/dashboards/osm-mesh-envoy-details.json
@@ -70,7 +70,7 @@
           "values": false
         }
       },
-      "pluginVersion": "7.0.1",
+      "pluginVersion": "8.2.2",
       "targets": [
         {
           "expr": "sum(osm_resource_namespace_count{source_pod_name=~\"$osm_controller_instance\"}) by (source_pod_name)",
@@ -217,7 +217,7 @@
                     "values": false
                 }
             },
-            "pluginVersion": "7.0.1",
+            "pluginVersion": "8.2.2",
             "targets": [
                 {
                     "expr": "avg_over_time(osm_proxy_config_update_time_sum{resource_type=\"$xds_path\", source_pod_name=~\"$osm_controller_instance\"}[1y:1s])",
@@ -270,7 +270,7 @@
                     "values": false
                 }
             },
-            "pluginVersion": "7.0.1",
+            "pluginVersion": "8.2.2",
             "targets": [
                 {
                     "expr": "max_over_time(osm_proxy_config_update_time_sum{resource_type=\"$xds_path\", source_pod_name=~\"$osm_controller_instance\"}[1y:1s])",
@@ -458,7 +458,7 @@
         "dataLinks": []
       },
       "percentage": false,
-      "pluginVersion": "7.0.1",
+      "pluginVersion": "8.2.2",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -585,7 +585,7 @@
       "legend": {
         "show": false
       },
-      "pluginVersion": "7.0.1",
+      "pluginVersion": "8.2.2",
       "reverseYBuckets": false,
       "targets": [
         {
@@ -672,7 +672,7 @@
       "legend": {
         "show": false
       },
-      "pluginVersion": "7.0.1",
+      "pluginVersion": "8.2.2",
       "reverseYBuckets": false,
       "targets": [
         {
@@ -759,7 +759,7 @@
       "legend": {
         "show": false
       },
-      "pluginVersion": "7.0.1",
+      "pluginVersion": "8.2.2",
       "reverseYBuckets": false,
       "targets": [
         {
@@ -851,7 +851,7 @@
         "dataLinks": []
       },
       "percentage": false,
-      "pluginVersion": "7.0.1",
+      "pluginVersion": "8.2.2",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -967,7 +967,7 @@
         "dataLinks": []
       },
       "percentage": false,
-      "pluginVersion": "7.0.1",
+      "pluginVersion": "8.2.2",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
diff --git a/charts/osm/grafana/dashboards/osm-pod.json b/charts/osm/grafana/dashboards/osm-pod.json
index 0701309f86..d154ec2777 100644
--- a/charts/osm/grafana/dashboards/osm-pod.json
+++ b/charts/osm/grafana/dashboards/osm-pod.json
@@ -20,7 +20,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "7.0.1"
+      "version": "8.2.2"
     },
     {
       "type": "panel",
@@ -132,7 +132,7 @@
           "dataLinks": []
         },
         "percentage": false,
-        "pluginVersion": "7.0.1",
+        "pluginVersion": "8.2.2",
         "pointradius": 2,
         "points": false,
         "renderer": "flot",
@@ -238,7 +238,7 @@
           "dataLinks": []
         },
         "percentage": false,
-        "pluginVersion": "7.0.1",
+        "pluginVersion": "8.2.2",
         "pointradius": 2,
         "points": false,
         "renderer": "flot",
@@ -436,7 +436,7 @@
         "options": {
           "dataLinks": []
         },
-        "pluginVersion": "7.0.1",
+        "pluginVersion": "8.2.2",
         "targets": [
           {
             "expr": "envoy_cluster_upstream_cx_active{source_pod_name=\"$source_pod\",source_namespace=\"$source_namespace\",envoy_cluster_name!~\"osm-controller|envoy-metrics-cluster|envoy-tracing-cluster|passthrough-outbound\"}",
diff --git a/charts/osm/grafana/dashboards/osm-service-to-service.json b/charts/osm/grafana/dashboards/osm-service-to-service.json
index 1b163e2d25..8be57fea6e 100644
--- a/charts/osm/grafana/dashboards/osm-service-to-service.json
+++ b/charts/osm/grafana/dashboards/osm-service-to-service.json
@@ -20,7 +20,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "7.0.1"
+      "version": "8.2.2"
     },
     {
       "type": "panel",
@@ -132,7 +132,7 @@
           "dataLinks": []
         },
         "percentage": false,
-        "pluginVersion": "7.0.1",
+        "pluginVersion": "8.2.2",
         "pointradius": 2,
         "points": false,
         "renderer": "flot",
@@ -238,7 +238,7 @@
           "dataLinks": []
         },
         "percentage": false,
-        "pluginVersion": "7.0.1",
+        "pluginVersion": "8.2.2",
         "pointradius": 2,
         "points": false,
         "renderer": "flot",
@@ -340,7 +340,7 @@
         "options": {
           "dataLinks": []
         },
-        "pluginVersion": "7.0.1",
+        "pluginVersion": "8.2.2",
         "targets": [
           {
             "expr": "sum(envoy_cluster_upstream_cx_active{source_service=\"$source_service\",source_namespace=\"$source_namespace\",envoy_cluster_name=\"$destination_service\"})",
diff --git a/charts/osm/grafana/dashboards/osm-workload-to-workload.json b/charts/osm/grafana/dashboards/osm-workload-to-workload.json
index db96a9881e..82bb7dbba3 100644
--- a/charts/osm/grafana/dashboards/osm-workload-to-workload.json
+++ b/charts/osm/grafana/dashboards/osm-workload-to-workload.json
@@ -20,7 +20,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "7.0.1"
+      "version": "8.2.2"
     },
     {
       "type": "panel",
diff --git a/charts/osm/grafana/dashboards/osm-workload.json b/charts/osm/grafana/dashboards/osm-workload.json
index 985fefe885..7cec043baf 100644
--- a/charts/osm/grafana/dashboards/osm-workload.json
+++ b/charts/osm/grafana/dashboards/osm-workload.json
@@ -20,7 +20,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "7.0.1"
+      "version": "8.2.2"
     },
     {
       "type": "panel",
@@ -132,7 +132,7 @@
           "dataLinks": []
         },
         "percentage": false,
-        "pluginVersion": "7.0.1",
+        "pluginVersion": "8.2.2",
         "pointradius": 2,
         "points": false,
         "renderer": "flot",
@@ -238,7 +238,7 @@
           "dataLinks": []
         },
         "percentage": false,
-        "pluginVersion": "7.0.1",
+        "pluginVersion": "8.2.2",
         "pointradius": 2,
         "points": false,
         "renderer": "flot",
@@ -340,7 +340,7 @@
         "options": {
           "dataLinks": []
         },
-        "pluginVersion": "7.0.1",
+        "pluginVersion": "8.2.2",
         "targets": [
           {
             "expr": "envoy_cluster_upstream_cx_active{source_namespace=\"$source_namespace\",source_workload_kind=\"$source_workload_kind\",source_workload_name=\"$source_workload_name\",envoy_cluster_name!~\"osm-controller|envoy-metrics-cluster|envoy-tracing-cluster|passthrough-outbound\"}",