diff --git a/chronos-umbrella/files/dashboards/site/chronos-dashboard.json b/chronos-umbrella/files/dashboards/site/chronos-dashboard.json
index d68c659..9a195cb 100644
--- a/chronos-umbrella/files/dashboards/site/chronos-dashboard.json
+++ b/chronos-umbrella/files/dashboards/site/chronos-dashboard.json
@@ -21,8 +21,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 1,
-  "iteration": 1639387947854,
+  "iteration": 1639657683126,
   "links": [],
   "panels": [
     {
@@ -86,7 +85,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "device_connected_status",
+          "expr": "device_connected_status{site=\"$site\"}",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -170,7 +169,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "slice_throughput_packets",
+          "expr": "slice_throughput_packets{site=\"$site\"}",
           "interval": "",
           "legendFormat": "{{slice}}",
           "queryType": "randomWalk",
@@ -252,9 +251,9 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "slice_latency_end_to_end_milliseconds",
+          "expr": "slice_latency_end_to_end_milliseconds{site=\"$site\"}",
           "interval": "",
-          "legendFormat": "{{slice}}, {{site}}",
+          "legendFormat": "{{slice}},",
           "queryType": "randomWalk",
           "refId": "A"
         }
@@ -334,7 +333,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "slice_throughput_bytes",
+          "expr": "slice_throughput_bytes{site=\"$site\"}",
           "interval": "",
           "legendFormat": "{{slice}}",
           "queryType": "randomWalk",
@@ -418,46 +417,186 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "device_connection_event_core",
+          "expr": "device_connection_event_core{site=\"$site\"}",
           "interval": "",
           "legendFormat": "{{iccid}}",
           "queryType": "randomWalk",
           "refId": "A"
-        },
-        {
-          "exemplar": true,
-          "expr": "device_connection_event_ran",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "{{iccid}}",
-          "refId": "B"
-        },
-        {
-          "exemplar": true,
-          "expr": "device_connection_event_fabric",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "{{iccid}}",
-          "refId": "C"
         }
       ],
-      "title": "device_connection_event",
+      "title": "Device Connection Event Core",
       "type": "timeseries"
     },
     {
-      "datasource": null,
+      "datasource": "${datasource}",
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "stepBefore",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
       "gridPos": {
-        "h": 1,
+        "h": 8,
         "w": 24,
         "x": 0,
         "y": 20
       },
-      "id": 4,
-      "title": "Row title",
-      "type": "row"
+      "id": 15,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.2",
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "device_connection_event_ran{site=\"$site\"}",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "{{iccid}}",
+          "refId": "B"
+        }
+      ],
+      "title": "Device Connection Event Ran",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${datasource}",
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "stepBefore",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 24,
+        "x": 0,
+        "y": 28
+      },
+      "id": 16,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.2",
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "device_connection_event_fabric{site=\"$site\"}",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "{{iccid}}",
+          "refId": "B"
+        }
+      ],
+      "title": "Device Connection Event Fabric",
+      "type": "timeseries"
     }
   ],
-  "refresh": "",
+  "refresh": "5s",
   "schemaVersion": 30,
   "style": "dark",
   "tags": [],
@@ -465,7 +604,7 @@
     "list": [
       {
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "datasource-chronos",
           "value": "datasource-chronos"
         },
@@ -483,16 +622,43 @@
         "regex": "",
         "skipUrlSync": false,
         "type": "datasource"
+      },
+      {
+        "allValue": null,
+        "current": {
+          "selected": true,
+          "text": "freemont",
+          "value": "freemont"
+        },
+        "datasource": "${datasource}",
+        "definition": "label_values(site)",
+        "description": null,
+        "error": null,
+        "hide": 0,
+        "includeAll": false,
+        "label": null,
+        "multi": false,
+        "name": "site",
+        "options": [],
+        "query": {
+          "query": "label_values(site)",
+          "refId": "StandardVariableQuery"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
       }
     ]
   },
   "time": {
-    "from": "now-1h",
+    "from": "now-15m",
     "to": "now"
   },
   "timepicker": {},
   "timezone": "",
   "title": "Chronos Dashboard",
-  "uid": "F_ubZr27z",
+  "uid": "chronos",
   "version": 1
 }
\ No newline at end of file