diff --git a/nem-monitoring/Chart.yaml b/nem-monitoring/Chart.yaml
index 44b9a31..0d5a128 100644
--- a/nem-monitoring/Chart.yaml
+++ b/nem-monitoring/Chart.yaml
@@ -18,4 +18,4 @@
 description: Time Series Storage and Dashboard for CORD
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 1.3.5
+version: 1.3.6
diff --git a/nem-monitoring/grafana-dashboards/omec-user-plane-summary.json b/nem-monitoring/grafana-dashboards/omec-user-plane-summary.json
index c386151..446d500 100644
--- a/nem-monitoring/grafana-dashboards/omec-user-plane-summary.json
+++ b/nem-monitoring/grafana-dashboards/omec-user-plane-summary.json
@@ -15,8 +15,8 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 5,
-  "iteration": 1580754449762,
+  "id": 2,
+  "iteration": 1580781656482,
   "links": [],
   "panels": [
     {
@@ -149,7 +149,8 @@
                 "color": "red",
                 "value": 80
               }
-            ]
+            ],
+            "unit": "percent"
           },
           "override": {},
           "values": false
@@ -375,7 +376,7 @@
         "#d44a3a"
       ],
       "datasource": null,
-      "format": "s",
+      "format": "none",
       "gauge": {
         "maxValue": 100,
         "minValue": 0,
@@ -430,7 +431,8 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "count(ue_info{datacenter=\"$site\"})",
+          "expr": "count(ue_info{EDGE=\"$site\"})",
+          "instant": true,
           "refId": "A"
         }
       ],
@@ -564,7 +566,8 @@
                 "color": "red",
                 "value": 80
               }
-            ]
+            ],
+            "unit": "percent"
           },
           "override": {},
           "values": false