diff --git a/metrics/waku-fleet-dashboard.json b/metrics/waku-fleet-dashboard.json
index 1d8be0b1b..e4711e979 100644
--- a/metrics/waku-fleet-dashboard.json
+++ b/metrics/waku-fleet-dashboard.json
@@ -450,7 +450,7 @@
             "h": 9,
             "w": 12,
             "x": 0,
-            "y": 1074
+            "y": 197
           },
           "id": 81,
           "options": {
@@ -547,7 +547,7 @@
             "h": 9,
             "w": 12,
             "x": 12,
-            "y": 1074
+            "y": 197
           },
           "id": 82,
           "options": {
@@ -647,7 +647,7 @@
             "h": 9,
             "w": 12,
             "x": 0,
-            "y": 1083
+            "y": 206
           },
           "id": 78,
           "interval": "15s",
@@ -751,7 +751,7 @@
             "h": 9,
             "w": 12,
             "x": 12,
-            "y": 1083
+            "y": 206
           },
           "id": 79,
           "options": {
@@ -835,8 +835,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -852,7 +851,7 @@
             "h": 10,
             "w": 12,
             "x": 0,
-            "y": 1092
+            "y": 215
           },
           "id": 124,
           "options": {
@@ -940,8 +939,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -957,7 +955,7 @@
             "h": 10,
             "w": 12,
             "x": 12,
-            "y": 1092
+            "y": 215
           },
           "id": 126,
           "options": {
@@ -1041,8 +1039,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   }
                 ]
               },
@@ -1054,7 +1051,7 @@
             "h": 10,
             "w": 12,
             "x": 0,
-            "y": 1102
+            "y": 225
           },
           "id": 169,
           "options": {
@@ -1140,8 +1137,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   }
                 ]
               },
@@ -1153,7 +1149,7 @@
             "h": 10,
             "w": 12,
             "x": 12,
-            "y": 1102
+            "y": 225
           },
           "id": 170,
           "options": {
@@ -1240,8 +1236,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -1257,7 +1252,7 @@
             "h": 9,
             "w": 12,
             "x": 0,
-            "y": 1112
+            "y": 235
           },
           "id": 11,
           "options": {
@@ -1340,8 +1335,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -1356,7 +1350,7 @@
             "h": 9,
             "w": 12,
             "x": 12,
-            "y": 1112
+            "y": 235
           },
           "id": 54,
           "options": {
@@ -1439,8 +1433,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -1455,7 +1448,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 1121
+            "y": 244
           },
           "id": 66,
           "options": {
@@ -1536,8 +1529,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -1552,7 +1544,7 @@
             "h": 9,
             "w": 12,
             "x": 12,
-            "y": 1121
+            "y": 244
           },
           "id": 122,
           "options": {
@@ -1666,8 +1658,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -1682,7 +1673,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 1130
+            "y": 253
           },
           "id": 68,
           "options": {
@@ -1780,8 +1771,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -1796,7 +1786,7 @@
             "h": 6,
             "w": 12,
             "x": 0,
-            "y": 2
+            "y": 1559
           },
           "id": 48,
           "options": {
@@ -1877,8 +1867,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -1893,7 +1882,7 @@
             "h": 6,
             "w": 12,
             "x": 12,
-            "y": 2
+            "y": 1559
           },
           "id": 50,
           "options": {
@@ -1974,8 +1963,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -1990,7 +1978,7 @@
             "h": 6,
             "w": 12,
             "x": 0,
-            "y": 670
+            "y": 2461
           },
           "id": 60,
           "options": {
@@ -2096,8 +2084,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -2112,7 +2099,7 @@
             "h": 6,
             "w": 12,
             "x": 12,
-            "y": 670
+            "y": 2461
           },
           "id": 8,
           "options": {
@@ -2196,8 +2183,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -2212,7 +2198,7 @@
             "h": 6,
             "w": 12,
             "x": 0,
-            "y": 676
+            "y": 2467
           },
           "id": 2,
           "options": {
@@ -2299,8 +2285,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -2316,7 +2301,7 @@
             "h": 6,
             "w": 12,
             "x": 12,
-            "y": 676
+            "y": 2467
           },
           "id": 83,
           "options": {
@@ -2399,8 +2384,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -2415,7 +2399,7 @@
             "h": 6,
             "w": 12,
             "x": 0,
-            "y": 682
+            "y": 2473
           },
           "id": 3,
           "options": {
@@ -2499,8 +2483,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -2515,7 +2498,7 @@
             "h": 6,
             "w": 12,
             "x": 12,
-            "y": 682
+            "y": 2473
           },
           "id": 9,
           "options": {
@@ -2640,7 +2623,7 @@
             "h": 6,
             "w": 12,
             "x": 0,
-            "y": 688
+            "y": 2479
           },
           "id": 6,
           "options": {
@@ -2737,7 +2720,7 @@
             "h": 6,
             "w": 12,
             "x": 12,
-            "y": 688
+            "y": 2479
           },
           "id": 7,
           "options": {
@@ -2862,7 +2845,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 694
+            "y": 2485
           },
           "id": 44,
           "options": {
@@ -2984,7 +2967,7 @@
             "h": 6,
             "w": 12,
             "x": 12,
-            "y": 694
+            "y": 2485
           },
           "id": 10,
           "options": {
@@ -3083,7 +3066,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 700
+            "y": 2491
           },
           "id": 64,
           "options": {
@@ -3185,7 +3168,7 @@
             "h": 6,
             "w": 12,
             "x": 0,
-            "y": 702
+            "y": 2493
           },
           "id": 4,
           "options": {
@@ -3282,7 +3265,7 @@
             "h": 6,
             "w": 12,
             "x": 12,
-            "y": 708
+            "y": 2499
           },
           "id": 5,
           "options": {
@@ -3378,8 +3361,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -3394,7 +3376,7 @@
             "h": 8,
             "w": 8,
             "x": 0,
-            "y": 3
+            "y": 1560
           },
           "id": 159,
           "options": {
@@ -3475,8 +3457,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -3491,7 +3472,7 @@
             "h": 8,
             "w": 8,
             "x": 8,
-            "y": 3
+            "y": 1560
           },
           "id": 117,
           "options": {
@@ -3573,8 +3554,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -3589,7 +3569,7 @@
             "h": 8,
             "w": 8,
             "x": 16,
-            "y": 3
+            "y": 1560
           },
           "id": 160,
           "options": {
@@ -3670,8 +3650,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -3687,7 +3666,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 27
+            "y": 1818
           },
           "id": 119,
           "options": {
@@ -3768,8 +3747,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -3784,7 +3762,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 27
+            "y": 1818
           },
           "id": 121,
           "options": {
@@ -3865,8 +3843,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -3881,7 +3858,7 @@
             "h": 8,
             "w": 8,
             "x": 0,
-            "y": 35
+            "y": 1826
           },
           "id": 113,
           "options": {
@@ -3963,8 +3940,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -3979,7 +3955,7 @@
             "h": 8,
             "w": 8,
             "x": 8,
-            "y": 35
+            "y": 1826
           },
           "id": 115,
           "options": {
@@ -4102,7 +4078,7 @@
             "h": 6,
             "w": 12,
             "x": 0,
-            "y": 355
+            "y": 4
           },
           "id": 36,
           "options": {
@@ -4125,10 +4101,12 @@
                 "type": "prometheus",
                 "uid": "P6693426190CB2316"
               },
+              "editorMode": "code",
               "exemplar": true,
               "expr": "waku_store_peers{instance=~\"[[host]].([[dc:pipe]]).*.([[fleet:pipe]])\"}",
               "interval": "",
               "legendFormat": "{{instance}}",
+              "range": true,
               "refId": "A"
             }
           ],
@@ -4199,7 +4177,7 @@
             "h": 6,
             "w": 12,
             "x": 12,
-            "y": 355
+            "y": 4
           },
           "id": 38,
           "options": {
@@ -4311,7 +4289,7 @@
             "h": 6,
             "w": 12,
             "x": 0,
-            "y": 361
+            "y": 10
           },
           "id": 62,
           "options": {
@@ -4410,7 +4388,7 @@
             "h": 6,
             "w": 12,
             "x": 12,
-            "y": 361
+            "y": 10
           },
           "id": 40,
           "options": {
@@ -4524,7 +4502,7 @@
             "h": 11,
             "w": 12,
             "x": 0,
-            "y": 367
+            "y": 16
           },
           "id": 144,
           "options": {
@@ -4629,7 +4607,7 @@
             "h": 11,
             "w": 12,
             "x": 12,
-            "y": 367
+            "y": 16
           },
           "id": 145,
           "options": {
@@ -4722,7 +4700,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   }
                 ]
               },
@@ -4734,7 +4713,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 378
+            "y": 27
           },
           "id": 146,
           "options": {
@@ -4826,7 +4805,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   }
                 ]
               },
@@ -4838,7 +4818,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 378
+            "y": 27
           },
           "id": 148,
           "options": {
@@ -4930,7 +4910,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   }
                 ]
               },
@@ -4942,7 +4923,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 386
+            "y": 35
           },
           "id": 158,
           "options": {
@@ -5033,7 +5014,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   }
                 ]
               },
@@ -5045,7 +5027,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 386
+            "y": 35
           },
           "id": 157,
           "options": {
@@ -5135,7 +5117,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   }
                 ]
               },
@@ -5147,7 +5130,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 394
+            "y": 43
           },
           "id": 149,
           "options": {
@@ -5233,7 +5216,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   }
                 ]
               },
@@ -5270,7 +5254,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 394
+            "y": 43
           },
           "id": 147,
           "options": {
@@ -5332,7 +5316,7 @@
             "h": 7,
             "w": 12,
             "x": 0,
-            "y": 402
+            "y": 51
           },
           "id": 77,
           "maxDataPoints": 60,
@@ -5431,7 +5415,7 @@
             "h": 7,
             "w": 12,
             "x": 12,
-            "y": 402
+            "y": 51
           },
           "id": 75,
           "maxDataPoints": 60,
@@ -5577,7 +5561,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -5593,7 +5578,7 @@
             "h": 13,
             "w": 12,
             "x": 0,
-            "y": 409
+            "y": 58
           },
           "id": 142,
           "options": {
@@ -5678,7 +5663,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -5694,7 +5680,7 @@
             "h": 13,
             "w": 12,
             "x": 12,
-            "y": 409
+            "y": 58
           },
           "id": 130,
           "options": {
@@ -5779,7 +5765,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -5795,7 +5782,7 @@
             "h": 13,
             "w": 12,
             "x": 0,
-            "y": 422
+            "y": 71
           },
           "id": 132,
           "options": {
@@ -5882,7 +5869,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -5898,7 +5886,7 @@
             "h": 13,
             "w": 12,
             "x": 12,
-            "y": 422
+            "y": 71
           },
           "id": 143,
           "options": {
@@ -5985,7 +5973,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -6001,7 +5990,7 @@
             "h": 13,
             "w": 12,
             "x": 0,
-            "y": 435
+            "y": 84
           },
           "id": 128,
           "options": {
@@ -6088,7 +6077,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -6104,7 +6094,7 @@
             "h": 13,
             "w": 12,
             "x": 12,
-            "y": 435
+            "y": 84
           },
           "id": 141,
           "options": {
@@ -6245,7 +6235,7 @@
             "uid": "P6693426190CB2316"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "expr": "sum by(direction, protocol) (total_bytes_exchanged_total{instance=~\"[[host]].([[dc:pipe]]).*.([[fleet:pipe]])\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": false,
@@ -6590,10 +6580,13 @@
         {
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "total_messages_cached_total{instance=~\"[[host]].([[dc:pipe]]).*.([[fleet:pipe]])\"}",
+          "exemplar": false,
+          "expr": "total_messages_cached{instance=~\"[[host]].([[dc:pipe]]).*.([[fleet:pipe]])\"}",
+          "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
-          "legendFormat": "__auto",
+          "instant": false,
+          "legendFormat": "{{instance}}",
           "range": true,
           "refId": "A",
           "useBackend": false
@@ -6675,7 +6668,7 @@
             "h": 8,
             "w": 8,
             "x": 0,
-            "y": 2595
+            "y": 4386
           },
           "id": 93,
           "options": {
@@ -6774,7 +6767,7 @@
             "h": 8,
             "w": 8,
             "x": 8,
-            "y": 2595
+            "y": 4386
           },
           "id": 89,
           "options": {
@@ -6870,7 +6863,7 @@
             "h": 8,
             "w": 8,
             "x": 16,
-            "y": 2595
+            "y": 4386
           },
           "id": 91,
           "options": {
@@ -6927,7 +6920,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 2603
+            "y": 4394
           },
           "id": 95,
           "options": {
@@ -7009,7 +7002,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 2603
+            "y": 4394
           },
           "id": 97,
           "options": {
@@ -7131,7 +7124,7 @@
             "h": 13,
             "w": 12,
             "x": 0,
-            "y": 2611
+            "y": 4402
           },
           "id": 134,
           "options": {
@@ -7234,7 +7227,7 @@
             "h": 13,
             "w": 12,
             "x": 12,
-            "y": 2611
+            "y": 4402
           },
           "id": 136,
           "options": {
@@ -7347,7 +7340,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 2670
+            "y": 4461
           },
           "id": 30,
           "options": {
@@ -7443,7 +7436,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 2670
+            "y": 4461
           },
           "id": 32,
           "options": {
@@ -7541,7 +7534,7 @@
             "h": 12,
             "w": 12,
             "x": 0,
-            "y": 2678
+            "y": 4469
           },
           "id": 138,
           "options": {
@@ -7644,7 +7637,7 @@
             "h": 12,
             "w": 12,
             "x": 12,
-            "y": 2678
+            "y": 4469
           },
           "id": 140,
           "options": {
@@ -7760,7 +7753,7 @@
             "h": 12,
             "w": 12,
             "x": 0,
-            "y": 2691
+            "y": 4482
           },
           "id": 153,
           "options": {
@@ -7863,7 +7856,7 @@
             "h": 12,
             "w": 12,
             "x": 12,
-            "y": 2691
+            "y": 4482
           },
           "id": 154,
           "options": {
@@ -7933,7 +7926,7 @@
             "h": 12,
             "w": 12,
             "x": 0,
-            "y": 2703
+            "y": 4494
           },
           "id": 156,
           "options": {
@@ -8042,7 +8035,7 @@
             "h": 12,
             "w": 12,
             "x": 12,
-            "y": 2703
+            "y": 4494
           },
           "id": 155,
           "options": {
@@ -8158,7 +8151,7 @@
             "h": 7,
             "w": 8,
             "x": 0,
-            "y": 2716
+            "y": 4507
           },
           "id": 13,
           "options": {
@@ -8256,7 +8249,7 @@
             "h": 7,
             "w": 8,
             "x": 8,
-            "y": 2716
+            "y": 4507
           },
           "id": 18,
           "options": {
@@ -8432,7 +8425,7 @@
             "h": 7,
             "w": 8,
             "x": 16,
-            "y": 2716
+            "y": 4507
           },
           "id": 42,
           "options": {
@@ -8525,7 +8518,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 2723
+            "y": 4514
           },
           "id": 103,
           "options": {
@@ -8621,7 +8614,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 2723
+            "y": 4514
           },
           "id": 102,
           "options": {
@@ -8684,7 +8677,7 @@
             "h": 8,
             "w": 24,
             "x": 0,
-            "y": 2731
+            "y": 4522
           },
           "id": 101,
           "options": {
@@ -8758,7 +8751,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 2739
+            "y": 4530
           },
           "id": 105,
           "options": {
@@ -8829,7 +8822,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 2739
+            "y": 4530
           },
           "id": 104,
           "options": {
@@ -8951,7 +8944,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 2748
+            "y": 4539
           },
           "id": 109,
           "options": {
@@ -9058,9 +9051,7 @@
       {
         "current": {
           "text": "All",
-          "value": [
-            "$__all"
-          ]
+          "value": "$__all"
         },
         "datasource": {
           "type": "prometheus",
@@ -9084,7 +9075,7 @@
     ]
   },
   "time": {
-    "from": "now-7d",
+    "from": "now-24h",
     "to": "now"
   },
   "timepicker": {
@@ -9103,6 +9094,6 @@
   "timezone": "browser",
   "title": "Nim-Waku V2",
   "uid": "qrp_ZCTGz",
-  "version": 180,
+  "version": 181,
   "weekStart": ""
 }
\ No newline at end of file