diff --git a/nem-monitoring/grafana-dashboards/voltha-kpi.json b/nem-monitoring/grafana-dashboards/voltha-kpi.json
index 2f8823c..911543e 100644
--- a/nem-monitoring/grafana-dashboards/voltha-kpi.json
+++ b/nem-monitoring/grafana-dashboards/voltha-kpi.json
@@ -2,6 +2,7 @@
   "annotations": {
     "list": [
       {
+        "$$hashKey": "object:894",
         "builtIn": 1,
         "datasource": "-- Grafana --",
         "enable": true,
@@ -12,12 +13,15 @@
       }
     ]
   },
+  "description": "Display KPIs as collected by VOLTHA",
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
+  "iteration": 1538522071785,
   "links": [],
   "panels": [
     {
+      "collapsed": false,
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -25,6 +29,7 @@
         "y": 0
       },
       "id": 7,
+      "panels": [],
       "title": "Bytes",
       "type": "row"
     },
@@ -70,6 +75,7 @@
           "expr": "sum(tx_bytes_total{title=\"Ethernet\"})by(logical_device_id)  / 1024 / 1024",
           "format": "time_series",
           "intervalFactor": 1,
+          "legendFormat": "{{logical_device_id}}",
           "refId": "A"
         }
       ],
@@ -155,6 +161,7 @@
           "expr": "sum(rx_bytes_total{title=\"Ethernet\"})by(logical_device_id) / 1024 / 1024",
           "format": "time_series",
           "intervalFactor": 1,
+          "legendFormat": "{{logical_device_id}}",
           "refId": "A"
         }
       ],
@@ -253,6 +260,7 @@
           "expr": "sum(tx_packets_total{title=\"Ethernet\"})by(logical_device_id)",
           "format": "time_series",
           "intervalFactor": 1,
+          "legendFormat": "{{logical_device_id}}",
           "refId": "A"
         }
       ],
@@ -338,6 +346,7 @@
           "expr": "sum(rx_packets_total{title=\"Ethernet\"})by(logical_device_id)",
           "format": "time_series",
           "intervalFactor": 1,
+          "legendFormat": "{{logical_device_id}}",
           "refId": "A"
         }
       ],
@@ -470,6 +479,7 @@
           "expr": "delta(rx_bytes_total{title=\"Ethernet\"}[30s]) / 1024 / 1024",
           "format": "time_series",
           "intervalFactor": 1,
+          "legendFormat": "{{logical_device_id}}",
           "refId": "A"
         }
       ],
@@ -524,6 +534,19 @@
       }
     },
     {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 31
+      },
+      "id": 19,
+      "panels": [],
+      "title": "Per device informations",
+      "type": "row"
+    },
+    {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
@@ -531,13 +554,14 @@
       "datasource": null,
       "fill": 1,
       "gridPos": {
-        "h": 10,
+        "h": 9,
         "w": 12,
         "x": 0,
-        "y": 31
+        "y": 32
       },
-      "id": 16,
+      "id": 21,
       "legend": {
+        "alignAsTable": false,
         "avg": false,
         "current": false,
         "max": false,
@@ -549,28 +573,40 @@
       "lines": true,
       "linewidth": 1,
       "links": [],
+      "minSpan": 12,
       "nullPointMode": "null",
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
+      "repeat": "olt",
+      "repeatDirection": "v",
+      "scopedVars": {
+        "olt": {
+          "$$hashKey": "object:1293",
+          "selected": false,
+          "text": "000000000a5a0073",
+          "value": "000000000a5a0073"
+        }
+      },
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "$$hashKey": "object:162",
-          "expr": "sum(rx_bytes_total{}) by (title, pon_id) / 1024 / 1024",
+          "$$hashKey": "object:987",
+          "expr": "rx_bytes_total{title=\"PON\", logical_device_id=\"$olt\"} / 1024 / 1024",
           "format": "time_series",
           "intervalFactor": 1,
+          "legendFormat": "{{pon_id}}",
           "refId": "A"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Rx bytes total by PON ID",
+      "title": "Received MB per PON on device $olt",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -586,6 +622,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:1472",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -594,6 +631,7 @@
           "show": true
         },
         {
+          "$$hashKey": "object:1473",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -615,13 +653,14 @@
       "datasource": null,
       "fill": 1,
       "gridPos": {
-        "h": 10,
+        "h": 9,
         "w": 12,
         "x": 12,
-        "y": 31
+        "y": 32
       },
-      "id": 17,
+      "id": 26,
       "legend": {
+        "alignAsTable": false,
         "avg": false,
         "current": false,
         "max": false,
@@ -633,28 +672,40 @@
       "lines": true,
       "linewidth": 1,
       "links": [],
+      "minSpan": 12,
       "nullPointMode": "null",
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
+      "repeat": "olt",
+      "repeatDirection": "v",
+      "scopedVars": {
+        "olt": {
+          "$$hashKey": "object:1293",
+          "selected": false,
+          "text": "000000000a5a0073",
+          "value": "000000000a5a0073"
+        }
+      },
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "$$hashKey": "object:162",
-          "expr": "sum(tx_bytes_total{}) by (title, pon_id) / 1024 / 1024",
+          "$$hashKey": "object:987",
+          "expr": "tx_bytes_total{title=\"PON\", logical_device_id=\"$olt\"} / 1024 / 1024",
           "format": "time_series",
           "intervalFactor": 1,
+          "legendFormat": "{{pon_id}}",
           "refId": "A"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Tx bytes total by PON ID",
+      "title": "Transmitted MB per PON on device $olt",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -670,6 +721,7 @@
       },
       "yaxes": [
         {
+          "$$hashKey": "object:1472",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -678,6 +730,209 @@
           "show": true
         },
         {
+          "$$hashKey": "object:1473",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 41
+      },
+      "id": 27,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "minSpan": 12,
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatDirection": "v",
+      "repeatIteration": 1538522071785,
+      "repeatPanelId": 21,
+      "scopedVars": {
+        "olt": {
+          "$$hashKey": "object:1294",
+          "selected": false,
+          "text": "000000000a5a0072",
+          "value": "000000000a5a0072"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "$$hashKey": "object:987",
+          "expr": "rx_bytes_total{title=\"PON\", logical_device_id=\"$olt\"} / 1024 / 1024",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "{{pon_id}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Received MB per PON on device $olt",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:1472",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:1473",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 12,
+        "y": 41
+      },
+      "id": 28,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "minSpan": 12,
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatDirection": "v",
+      "repeatIteration": 1538522071785,
+      "repeatPanelId": 26,
+      "scopedVars": {
+        "olt": {
+          "$$hashKey": "object:1294",
+          "selected": false,
+          "text": "000000000a5a0072",
+          "value": "000000000a5a0072"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "$$hashKey": "object:987",
+          "expr": "tx_bytes_total{title=\"PON\", logical_device_id=\"$olt\"} / 1024 / 1024",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "{{pon_id}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Transmitted MB per PON on device $olt",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:1472",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:1473",
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -697,7 +952,51 @@
   "style": "dark",
   "tags": [],
   "templating": {
-    "list": []
+    "list": [
+      {
+        "allValue": null,
+        "current": {
+          "tags": [],
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "Prometheus",
+        "hide": 0,
+        "includeAll": true,
+        "label": "OLT Device",
+        "multi": false,
+        "name": "olt",
+        "options": [
+          {
+            "$$hashKey": "object:1292",
+            "selected": true,
+            "text": "All",
+            "value": "$__all"
+          },
+          {
+            "$$hashKey": "object:1293",
+            "selected": false,
+            "text": "000000000a5a0073",
+            "value": "000000000a5a0073"
+          },
+          {
+            "$$hashKey": "object:1294",
+            "selected": false,
+            "text": "000000000a5a0072",
+            "value": "000000000a5a0072"
+          }
+        ],
+        "query": "label_values(tx_bytes_total, logical_device_id)",
+        "refresh": 0,
+        "regex": "",
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      }
+    ]
   },
   "time": {
     "from": "now-5m",