diff --git a/.maintain/monitoring/grafana-dashboards/substrate-networking.json b/.maintain/monitoring/grafana-dashboards/substrate-networking.json
index 6eeae8e11e22a..e28976cbcbdb3 100644
--- a/.maintain/monitoring/grafana-dashboards/substrate-networking.json
+++ b/.maintain/monitoring/grafana-dashboards/substrate-networking.json
@@ -1,5 +1,13 @@
 {
   "__inputs": [
+    {
+      "name": "DS_PROMETHEUS",
+      "label": "Prometheus",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    },
     {
       "name": "VAR_METRIC_NAMESPACE",
       "type": "constant",
@@ -13,7 +21,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "6.7.3"
+      "version": "7.0.3"
     },
     {
       "type": "panel",
@@ -68,11 +76,11 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1594715467007,
+  "iteration": 1600757586874,
   "links": [],
   "panels": [
     {
-      "datasource": null,
+      "datasource": "${DS_PROMETHEUS}",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -89,6 +97,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
@@ -175,7 +189,7 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "${DS_PROMETHEUS}",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -194,6 +208,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
@@ -282,6 +302,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
@@ -370,6 +396,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
@@ -459,6 +491,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
@@ -547,6 +585,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
@@ -636,6 +680,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
@@ -720,7 +770,7 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "${DS_PROMETHEUS}",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -739,6 +789,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
@@ -841,6 +897,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
@@ -947,6 +1009,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -1035,6 +1103,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 1,
       "gridPos": {
@@ -1126,6 +1200,12 @@
       "dashes": false,
       "datasource": "$data_source",
       "description": "99.9% of the time, the output queue size for this protocol is below the given value",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
@@ -1231,6 +1311,12 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 1,
       "gridPos": {
@@ -1317,12 +1403,12 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "${DS_PROMETHEUS}",
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 96
+        "y": 52
       },
       "id": 27,
       "panels": [],
@@ -1335,13 +1421,19 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 97
+        "y": 53
       },
       "hiddenSeries": false,
       "id": 19,
@@ -1472,13 +1564,19 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 103
+        "y": 59
       },
       "hiddenSeries": false,
       "id": 189,
@@ -1568,13 +1666,19 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
         "w": 12,
         "x": 0,
-        "y": 109
+        "y": 65
       },
       "hiddenSeries": false,
       "id": 39,
@@ -1679,11 +1783,17 @@
       "dataFormat": "timeseries",
       "datasource": "$data_source",
       "description": "Each bucket represent a certain number of nodes using a certain bandwidth range.",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "gridPos": {
         "h": 6,
         "w": 12,
         "x": 12,
-        "y": 109
+        "y": 65
       },
       "heatmap": {},
       "hideZeroBuckets": false,
@@ -1734,13 +1844,19 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 7,
         "w": 12,
         "x": 0,
-        "y": 115
+        "y": 71
       },
       "hiddenSeries": false,
       "id": 81,
@@ -1829,13 +1945,19 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 7,
         "w": 12,
         "x": 12,
-        "y": 115
+        "y": 71
       },
       "hiddenSeries": false,
       "id": 46,
@@ -1918,12 +2040,12 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "${DS_PROMETHEUS}",
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 122
+        "y": 78
       },
       "id": 52,
       "panels": [],
@@ -1936,13 +2058,19 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 123
+        "y": 79
       },
       "hiddenSeries": false,
       "id": 54,
@@ -2042,12 +2170,12 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": "${DS_PROMETHEUS}",
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 129
+        "y": 85
       },
       "id": 25,
       "panels": [],
@@ -2062,13 +2190,19 @@
       "dashes": false,
       "datasource": "$data_source",
       "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 5,
         "w": 12,
         "x": 0,
-        "y": 130
+        "y": 86
       },
       "hiddenSeries": false,
       "id": 33,
@@ -2155,13 +2289,19 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 7,
       "gridPos": {
         "h": 5,
         "w": 12,
         "x": 12,
-        "y": 130
+        "y": 86
       },
       "hiddenSeries": false,
       "id": 35,
@@ -2244,13 +2384,19 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
         "w": 12,
         "x": 0,
-        "y": 135
+        "y": 91
       },
       "hiddenSeries": false,
       "id": 111,
@@ -2332,13 +2478,19 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
         "w": 12,
         "x": 12,
-        "y": 135
+        "y": 91
       },
       "hiddenSeries": false,
       "id": 112,
@@ -2421,13 +2573,19 @@
       "dashes": false,
       "datasource": "$data_source",
       "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 5,
         "w": 12,
         "x": 0,
-        "y": 139
+        "y": 95
       },
       "hiddenSeries": false,
       "id": 211,
@@ -2515,13 +2673,19 @@
       "dashes": false,
       "datasource": "$data_source",
       "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 5,
         "w": 12,
         "x": 12,
-        "y": 139
+        "y": 95
       },
       "hiddenSeries": false,
       "id": 233,
@@ -2608,13 +2772,19 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 5,
         "w": 12,
         "x": 0,
-        "y": 144
+        "y": 100
       },
       "hiddenSeries": false,
       "id": 68,
@@ -2699,13 +2869,19 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$data_source",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
       "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 5,
         "w": 12,
         "x": 12,
-        "y": 144
+        "y": 100
       },
       "hiddenSeries": false,
       "id": 234,
@@ -2784,8 +2960,8 @@
       }
     }
   ],
-  "refresh": "1m",
-  "schemaVersion": 22,
+  "refresh": "",
+  "schemaVersion": 25,
   "style": "dark",
   "tags": [],
   "templating": {
@@ -2794,15 +2970,14 @@
         "allValue": null,
         "current": {},
         "datasource": "$data_source",
-        "definition": "${metric_namespace}_cpu_usage_percentage",
+        "definition": "${metric_namespace}_build_info",
         "hide": 0,
         "includeAll": true,
-        "index": -1,
         "label": "Instance name filter",
         "multi": true,
         "name": "nodename",
         "options": [],
-        "query": "${metric_namespace}_cpu_usage_percentage",
+        "query": "${metric_namespace}_build_info",
         "refresh": 1,
         "regex": "/instance=\"(.*?)\"/",
         "skipUrlSync": false,
@@ -2820,7 +2995,6 @@
         "definition": "${metric_namespace}_sub_libp2p_notifications_sizes_count",
         "hide": 2,
         "includeAll": true,
-        "index": -1,
         "label": null,
         "multi": false,
         "name": "notif_protocol",
@@ -2843,7 +3017,6 @@
         "definition": "${metric_namespace}_sub_libp2p_requests_out_started_total",
         "hide": 2,
         "includeAll": true,
-        "index": -1,
         "label": null,
         "multi": false,
         "name": "request_protocol",
@@ -2862,8 +3035,8 @@
       {
         "current": {
           "selected": false,
-          "text": "prometheus.parity-mgmt",
-          "value": "prometheus.parity-mgmt"
+          "text": "Prometheus",
+          "value": "Prometheus"
         },
         "hide": 0,
         "includeAll": false,
@@ -2898,12 +3071,11 @@
     ]
   },
   "time": {
-    "from": "now-24h",
+    "from": "now-12h",
     "to": "now"
   },
   "timepicker": {
     "refresh_intervals": [
-      "5s",
       "10s",
       "30s",
       "1m",
@@ -2918,8 +3090,5 @@
   "timezone": "",
   "title": "Substrate Networking",
   "uid": "vKVuiD9Zk",
-  "variables": {
-    "list": []
-  },
-  "version": 113
+  "version": 1
 }