diff --git a/monitoring/configuration/dashboards/nwaku-monitoring.json b/monitoring/configuration/dashboards/nwaku-monitoring.json
index 3210aa6..0480e66 100644
--- a/monitoring/configuration/dashboards/nwaku-monitoring.json
+++ b/monitoring/configuration/dashboards/nwaku-monitoring.json
@@ -738,8 +738,8 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 10,
-        "w": 10,
+        "h": 9,
+        "w": 7,
         "x": 0,
         "y": 15
       },
@@ -807,9 +807,9 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 10,
-        "w": 11,
-        "x": 10,
+        "h": 9,
+        "w": 7,
+        "x": 7,
         "y": 15
       },
       "id": 156,
@@ -854,13 +854,82 @@
       "title": "Connected Peers Per Shard",
       "type": "piechart"
     },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "PBFA97CFB590B2093"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            }
+          },
+          "mappings": []
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 7,
+        "x": 14,
+        "y": 15
+      },
+      "id": 165,
+      "options": {
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "pieType": "pie",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "tooltip": {
+          "hideZeros": false,
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "12.1.1",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "waku_connected_peers_per_agent",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "legendFormat": "{{agent}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Connected Peers Per Agent",
+      "type": "piechart"
+    },
     {
       "collapsed": false,
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 25
+        "y": 24
       },
       "id": 45,
       "panels": [],
@@ -928,7 +997,7 @@
         "h": 9,
         "w": 8,
         "x": 0,
-        "y": 26
+        "y": 25
       },
       "id": 43,
       "options": {
@@ -992,7 +1061,7 @@
         "h": 9,
         "w": 9,
         "x": 8,
-        "y": 26
+        "y": 25
       },
       "id": 41,
       "options": {
@@ -1069,7 +1138,7 @@
         "h": 3,
         "w": 4,
         "x": 17,
-        "y": 26
+        "y": 25
       },
       "id": 38,
       "options": {
@@ -1134,7 +1203,7 @@
         "h": 3,
         "w": 4,
         "x": 17,
-        "y": 29
+        "y": 28
       },
       "id": 42,
       "options": {
@@ -1203,7 +1272,7 @@
         "h": 3,
         "w": 4,
         "x": 17,
-        "y": 32
+        "y": 31
       },
       "id": 39,
       "options": {
@@ -1305,7 +1374,7 @@
         "h": 9,
         "w": 8,
         "x": 0,
-        "y": 35
+        "y": 34
       },
       "id": 8,
       "options": {
@@ -1403,7 +1472,7 @@
         "h": 9,
         "w": 9,
         "x": 8,
-        "y": 35
+        "y": 34
       },
       "id": 29,
       "options": {
@@ -1463,7 +1532,7 @@
         "h": 5,
         "w": 4,
         "x": 17,
-        "y": 35
+        "y": 34
       },
       "id": 36,
       "options": {
@@ -1565,7 +1634,7 @@
         "h": 22,
         "w": 4,
         "x": 17,
-        "y": 40
+        "y": 39
       },
       "id": 149,
       "options": {
@@ -1663,7 +1732,7 @@
         "h": 9,
         "w": 8,
         "x": 0,
-        "y": 44
+        "y": 43
       },
       "id": 147,
       "options": {
@@ -1762,7 +1831,7 @@
         "h": 9,
         "w": 9,
         "x": 8,
-        "y": 44
+        "y": 43
       },
       "id": 148,
       "options": {
@@ -1860,7 +1929,7 @@
         "h": 9,
         "w": 8,
         "x": 0,
-        "y": 53
+        "y": 52
       },
       "id": 150,
       "options": {
@@ -1958,7 +2027,7 @@
         "h": 9,
         "w": 9,
         "x": 8,
-        "y": 53
+        "y": 52
       },
       "id": 151,
       "options": {
@@ -1996,60 +2065,19 @@
         "type": "prometheus",
         "uid": "PBFA97CFB590B2093"
       },
-      "description": "Number of messages currently stored in the database",
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
             "hideFrom": {
               "legend": false,
               "tooltip": false,
               "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "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": 0
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
+          "mappings": []
         },
         "overrides": []
       },
@@ -2057,18 +2085,23 @@
         "h": 10,
         "w": 7,
         "x": 0,
-        "y": 62
+        "y": 61
       },
-      "id": 141,
+      "id": 166,
       "options": {
         "legend": {
-          "calcs": [
-            "last"
-          ],
           "displayMode": "list",
           "placement": "bottom",
           "showLegend": true
         },
+        "pieType": "pie",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
         "tooltip": {
           "hideZeros": false,
           "mode": "single",
@@ -2082,16 +2115,19 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "editorMode": "code",
-          "expr": "pg_tb_stats_messages{}",
-          "instant": false,
-          "legendFormat": "{{ pubsubtopic }}",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "waku_relay_total_msg_bytes_per_shard",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "legendFormat": "shard-{{shard}}",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
-      "title": "# messages per shard",
-      "type": "timeseries"
+      "title": "Total Message Bytes Per Shard",
+      "type": "piechart"
     },
     {
       "datasource": {
@@ -2118,7 +2154,7 @@
         "h": 10,
         "w": 7,
         "x": 7,
-        "y": 62
+        "y": 61
       },
       "id": 157,
       "options": {
@@ -2159,7 +2195,7 @@
           "useBackend": false
         }
       ],
-      "title": "Max Size Message Per Shard",
+      "title": "Max Message Bytes Per Shard",
       "type": "piechart"
     },
     {
@@ -2187,7 +2223,7 @@
         "h": 10,
         "w": 7,
         "x": 14,
-        "y": 62
+        "y": 61
       },
       "id": 159,
       "options": {
@@ -2228,7 +2264,7 @@
           "useBackend": false
         }
       ],
-      "title": "Avg Size Message Per Shard",
+      "title": "Avg Message Bytes Per Shard",
       "type": "piechart"
     },
     {
@@ -2256,7 +2292,7 @@
         "h": 10,
         "w": 7,
         "x": 0,
-        "y": 72
+        "y": 71
       },
       "id": 164,
       "options": {
@@ -2325,7 +2361,7 @@
         "h": 10,
         "w": 7,
         "x": 7,
-        "y": 72
+        "y": 71
       },
       "id": 162,
       "options": {
@@ -2394,7 +2430,7 @@
         "h": 10,
         "w": 7,
         "x": 14,
-        "y": 72
+        "y": 71
       },
       "id": 163,
       "options": {
@@ -2503,7 +2539,7 @@
         "h": 10,
         "w": 7,
         "x": 0,
-        "y": 82
+        "y": 81
       },
       "id": 20,
       "options": {
@@ -2601,7 +2637,7 @@
         "h": 10,
         "w": 7,
         "x": 7,
-        "y": 82
+        "y": 81
       },
       "id": 18,
       "options": {
@@ -2738,7 +2774,7 @@
         "h": 10,
         "w": 7,
         "x": 14,
-        "y": 82
+        "y": 81
       },
       "id": 144,
       "options": {
@@ -2919,7 +2955,7 @@
         "h": 6,
         "w": 7,
         "x": 0,
-        "y": 92
+        "y": 91
       },
       "id": 135,
       "options": {
@@ -3021,7 +3057,7 @@
         "h": 6,
         "w": 7,
         "x": 7,
-        "y": 92
+        "y": 91
       },
       "id": 134,
       "options": {
@@ -3123,7 +3159,7 @@
         "h": 6,
         "w": 7,
         "x": 14,
-        "y": 92
+        "y": 91
       },
       "id": 128,
       "options": {
@@ -3225,7 +3261,7 @@
         "h": 6,
         "w": 7,
         "x": 0,
-        "y": 98
+        "y": 97
       },
       "id": 127,
       "options": {
@@ -3327,7 +3363,7 @@
         "h": 6,
         "w": 7,
         "x": 7,
-        "y": 98
+        "y": 97
       },
       "id": 126,
       "options": {
@@ -3429,7 +3465,7 @@
         "h": 6,
         "w": 7,
         "x": 14,
-        "y": 98
+        "y": 97
       },
       "id": 153,
       "options": {
@@ -3531,7 +3567,7 @@
         "h": 6,
         "w": 10,
         "x": 0,
-        "y": 104
+        "y": 103
       },
       "id": 152,
       "options": {
@@ -3633,7 +3669,7 @@
         "h": 6,
         "w": 11,
         "x": 10,
-        "y": 104
+        "y": 103
       },
       "id": 136,
       "options": {
@@ -3735,7 +3771,7 @@
         "h": 7,
         "w": 7,
         "x": 0,
-        "y": 110
+        "y": 109
       },
       "id": 137,
       "options": {
@@ -3760,11 +3796,11 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "waku_rln_valid_messages_total_bucket",
+          "expr": "waku_rln_valid_messages_total_total",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
-          "legendFormat": "__auto",
+          "legendFormat": "shard-{{shard}}",
           "range": true,
           "refId": "A",
           "useBackend": false
@@ -3837,7 +3873,7 @@
         "h": 7,
         "w": 7,
         "x": 7,
-        "y": 110
+        "y": 109
       },
       "id": 133,
       "options": {
@@ -3939,7 +3975,7 @@
         "h": 7,
         "w": 7,
         "x": 14,
-        "y": 110
+        "y": 109
       },
       "id": 130,
       "options": {
@@ -3983,7 +4019,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 117
+        "y": 116
       },
       "id": 46,
       "panels": [],
@@ -4052,7 +4088,7 @@
         "h": 9,
         "w": 9,
         "x": 0,
-        "y": 118
+        "y": 117
       },
       "id": 146,
       "options": {
@@ -4112,7 +4148,7 @@
         "h": 3,
         "w": 7,
         "x": 9,
-        "y": 118
+        "y": 117
       },
       "id": 11,
       "maxDataPoints": 100,
@@ -4170,7 +4206,7 @@
         "h": 3,
         "w": 6,
         "x": 16,
-        "y": 118
+        "y": 117
       },
       "id": 23,
       "maxDataPoints": 100,
@@ -4224,7 +4260,7 @@
         "h": 3,
         "w": 7,
         "x": 9,
-        "y": 121
+        "y": 120
       },
       "id": 37,
       "maxDataPoints": 100,
@@ -4283,7 +4319,7 @@
         "h": 3,
         "w": 6,
         "x": 16,
-        "y": 121
+        "y": 120
       },
       "id": 125,
       "options": {
@@ -4346,7 +4382,7 @@
         "h": 3,
         "w": 7,
         "x": 9,
-        "y": 124
+        "y": 123
       },
       "id": 84,
       "maxDataPoints": 100,
@@ -4405,7 +4441,7 @@
         "h": 3,
         "w": 6,
         "x": 16,
-        "y": 124
+        "y": 123
       },
       "id": 102,
       "maxDataPoints": 100,
@@ -4864,7 +4900,7 @@
         "h": 11,
         "w": 9,
         "x": 0,
-        "y": 127
+        "y": 126
       },
       "id": 121,
       "interval": "$Interval",
@@ -4930,7 +4966,7 @@
         "h": 3,
         "w": 7,
         "x": 9,
-        "y": 127
+        "y": 126
       },
       "id": 14,
       "maxDataPoints": 100,
@@ -4989,7 +5025,7 @@
         "h": 3,
         "w": 6,
         "x": 16,
-        "y": 127
+        "y": 126
       },
       "id": 93,
       "maxDataPoints": 100,
@@ -5064,7 +5100,7 @@
         "h": 8,
         "w": 3,
         "x": 9,
-        "y": 130
+        "y": 129
       },
       "id": 15,
       "options": {
@@ -5134,7 +5170,7 @@
         "h": 8,
         "w": 3,
         "x": 12,
-        "y": 130
+        "y": 129
       },
       "id": 9,
       "options": {
@@ -5204,7 +5240,7 @@
         "h": 8,
         "w": 3,
         "x": 15,
-        "y": 130
+        "y": 129
       },
       "id": 16,
       "options": {
@@ -5296,7 +5332,7 @@
         "h": 8,
         "w": 5,
         "x": 18,
-        "y": 130
+        "y": 129
       },
       "id": 12,
       "options": {
@@ -5377,7 +5413,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
                 "color": "red",
@@ -5754,7 +5791,7 @@
         "h": 9,
         "w": 12,
         "x": 0,
-        "y": 138
+        "y": 137
       },
       "id": 24,
       "interval": "$Interval",
@@ -5783,7 +5820,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.0.2",
+      "pluginVersion": "12.1.1",
       "targets": [
         {
           "expr": "sum by (state) (pg_stat_activity_count{instance=\"$Instance\"})",
@@ -5843,7 +5880,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
                 "color": "red",
@@ -5859,7 +5897,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 138
+        "y": 137
       },
       "id": 142,
       "options": {
@@ -5878,7 +5916,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.0.2",
+      "pluginVersion": "12.1.1",
       "targets": [
         {
           "datasource": {
@@ -5965,7 +6003,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
                 "color": "red",
@@ -5981,7 +6020,7 @@
         "h": 9,
         "w": 12,
         "x": 12,
-        "y": 146
+        "y": 145
       },
       "id": 27,
       "options": {
@@ -6002,7 +6041,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.0.2",
+      "pluginVersion": "12.1.1",
       "targets": [
         {
           "expr": "sum((rate(pg_stat_database_tup_inserted{instance=\"$Instance\"}[$Interval])))",
@@ -6073,7 +6112,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
                 "color": "red",
@@ -6089,7 +6129,7 @@
         "h": 9,
         "w": 12,
         "x": 0,
-        "y": 147
+        "y": 146
       },
       "id": 122,
       "options": {
@@ -6110,7 +6150,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.0.2",
+      "pluginVersion": "12.1.1",
       "targets": [
         {
           "expr": "sum ((rate(pg_stat_database_xact_commit[$Interval])))",
@@ -6177,7 +6217,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
                 "color": "red",
@@ -6193,7 +6234,7 @@
         "h": 9,
         "w": 12,
         "x": 12,
-        "y": 155
+        "y": 154
       },
       "id": 111,
       "options": {
@@ -6214,7 +6255,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.0.2",
+      "pluginVersion": "12.1.1",
       "targets": [
         {
           "expr": "sum((rate(pg_stat_database_tup_fetched{instance=\"$Instance\"}[$Interval])))",
@@ -6280,7 +6321,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
                 "color": "red",
@@ -6296,7 +6338,7 @@
         "h": 9,
         "w": 12,
         "x": 0,
-        "y": 156
+        "y": 155
       },
       "id": 26,
       "options": {
@@ -6317,7 +6359,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.0.2",
+      "pluginVersion": "12.1.1",
       "targets": [
         {
           "expr": "sum ((rate(pg_stat_database_blk_read_time{instance=\"$Instance\"}[$Interval])))",
@@ -6383,7 +6425,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
                 "color": "red",
@@ -6600,7 +6643,7 @@
         "h": 5,
         "w": 12,
         "x": 12,
-        "y": 164
+        "y": 163
       },
       "id": 30,
       "links": [
@@ -6627,7 +6670,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.0.2",
+      "pluginVersion": "12.1.1",
       "targets": [
         {
           "expr": "sum by (datname) ((rate(pg_stat_database_deadlocks{instance=\"$Instance\"}[$Interval])))",
@@ -6686,7 +6729,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
                 "color": "red",
@@ -6702,7 +6746,7 @@
         "h": 10,
         "w": 12,
         "x": 0,
-        "y": 165
+        "y": 164
       },
       "id": 123,
       "links": [
@@ -6729,7 +6773,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.0.2",
+      "pluginVersion": "12.1.1",
       "targets": [
         {
           "expr": "sum by (mode) (pg_locks_count{instance=\"$Instance\"})",
@@ -6788,7 +6832,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
                 "color": "red",
@@ -7005,7 +7050,7 @@
         "h": 5,
         "w": 12,
         "x": 12,
-        "y": 169
+        "y": 168
       },
       "id": 31,
       "links": [
@@ -7032,7 +7077,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.0.2",
+      "pluginVersion": "12.1.1",
       "targets": [
         {
           "expr": "sum by (datname) ((rate(pg_stat_database_temp_files{instance=\"$Instance\"}[$Interval])))",
@@ -7044,6 +7089,108 @@
       "title": "Temporary files by database (Postgres)",
       "type": "timeseries"
     },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "PBFA97CFB590B2093"
+      },
+      "description": "Number of messages currently stored in the database",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "barWidthFactor": 0.6,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "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": 0
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 7,
+        "x": 12,
+        "y": 173
+      },
+      "id": 141,
+      "options": {
+        "legend": {
+          "calcs": [
+            "last"
+          ],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "hideZeros": false,
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "12.1.1",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "editorMode": "code",
+          "expr": "pg_tb_stats_messages{}",
+          "instant": false,
+          "legendFormat": "{{ pubsubtopic }}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "# messages per shard",
+      "type": "timeseries"
+    },
     {
       "datasource": "Prometheus",
       "description": "Lag behind master in seconds.\n\nOnly available on a standby System.",
@@ -7092,7 +7239,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
                 "color": "red",
@@ -7108,7 +7256,7 @@
         "h": 10,
         "w": 12,
         "x": 0,
-        "y": 175
+        "y": 174
       },
       "id": 120,
       "interval": "1m",
@@ -7130,7 +7278,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.0.2",
+      "pluginVersion": "12.1.1",
       "targets": [
         {
           "expr": "max(pg_replication_lag{instance=\"$Instance\"})",