diff --git a/grafana/provisioning/dashboards/status-go.json b/grafana/provisioning/dashboards/status-go.json
index ff2cc84..e3a5727 100644
--- a/grafana/provisioning/dashboards/status-go.json
+++ b/grafana/provisioning/dashboards/status-go.json
@@ -95,7 +95,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "statusgo_waku_connected_peers",
+          "expr": "waku_connected_peers",
           "instant": false,
           "legendFormat": "Connected Peers",
           "range": true,
@@ -190,7 +190,7 @@
         {
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "statusgo_waku_peers_by_shard",
+          "expr": "waku_peers_by_shard",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "{{shard}}",
@@ -287,7 +287,7 @@
         {
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "statusgo_waku_peers_by_origin",
+          "expr": "waku_peers_by_origin",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "{{origin}}",
@@ -302,7 +302,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "sum(statusgo_waku_peers_by_origin)",
+          "expr": "sum(waku_peers_by_origin)",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": true,
@@ -369,7 +369,7 @@
         {
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "statusgo_waku_peer_dial_failures_total",
+          "expr": "waku_peer_dial_failures_total",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -474,7 +474,7 @@
           "disableTextWrap": false,
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "rate(statusgo_waku_peer_dial_failures_total[10m])",
+          "expr": "rate(waku_peer_dial_failures_total[10m])",
           "fullMetaSearch": false,
           "includeNullMetadata": false,
           "instant": true,
@@ -593,7 +593,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "increase(statusgo_waku_store_query_successes_total[5m])",
+          "expr": "increase(waku_store_query_successes_total[5m])",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": true,
@@ -607,7 +607,7 @@
         {
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "increase(statusgo_waku_store_query_failures_total[5m])",
+          "expr": "increase(waku_store_query_failures_total[5m])",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "Store Failed (5m)",
@@ -703,7 +703,7 @@
       "targets": [
         {
           "editorMode": "code",
-          "expr": "increase(statusgo_waku_message_delivery_confirmations_total[5m])",
+          "expr": "increase(waku_message_delivery_confirmations_total[5m])",
           "legendFormat": "Acked Messages (5m)",
           "range": true,
           "refId": "A"
@@ -797,7 +797,7 @@
       "targets": [
         {
           "editorMode": "code",
-          "expr": "sum(statusgo_waku_missed_messages_total) by (pubsub_topic)",
+          "expr": "sum(waku_missed_messages_total) by (pubsub_topic)",
           "legendFormat": "Total Missed Messages (5m) - {{pubsub_topic}}",
           "range": true,
           "refId": "A"
@@ -890,7 +890,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "statusgo_waku_envelope_sent_errors_total",
+          "expr": "waku_envelope_sent_errors_total",
           "instant": false,
           "legendFormat": "Message Errors",
           "range": true,
@@ -997,7 +997,7 @@
       "targets": [
         {
           "editorMode": "code",
-          "expr": "sum by (message_type) (statusgo_waku_raw_message_sent_total)",
+          "expr": "sum by (message_type) (waku_raw_message_sent_total)",
           "legendFormat": "__auto",
           "range": true,
           "refId": "A"
@@ -1059,7 +1059,7 @@
         {
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "statusgo_waku_raw_message_sent_total",
+          "expr": "waku_raw_message_sent_total",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "{{message_type}}",
@@ -1155,7 +1155,7 @@
       "targets": [
         {
           "editorMode": "code",
-          "expr": "sum by (message_type) (statusgo_waku_raw_message_size_bytes)",
+          "expr": "sum by (message_type) (waku_raw_message_size_bytes)",
           "legendFormat": "__auto",
           "range": true,
           "refId": "A"
@@ -1249,7 +1249,7 @@
         {
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by (message_type) (rate(statusgo_waku_raw_message_size_bytes[10m])) ",
+          "expr": "sum by (message_type) (rate(waku_raw_message_size_bytes[10m])) ",
           "fullMetaSearch": false,
           "includeNullMetadata": false,
           "legendFormat": "{{message_type}}",
@@ -1264,7 +1264,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum(rate(statusgo_waku_raw_message_size_bytes[10m]))",
+          "expr": "sum(rate(waku_raw_message_size_bytes[10m]))",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": true,
@@ -1363,7 +1363,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "statusgo_waku_messages_sent_total",
+          "expr": "waku_messages_sent_total",
           "instant": false,
           "legendFormat": "Messages Sent",
           "range": true,
@@ -1375,7 +1375,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(statusgo_waku_messages_received_total)",
+          "expr": "sum(waku_messages_received_total)",
           "instant": false,
           "legendFormat": "Messages Received",
           "range": true,
@@ -1470,7 +1470,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "rate(statusgo_waku_message_size_bytes[5m])",
+          "expr": "rate(waku_message_size_bytes[5m])",
           "instant": false,
           "legendFormat": "Message Size Rate",
           "range": true,
@@ -1565,7 +1565,7 @@
         {
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg_over_time(statusgo_waku_messages_sent_total_count[10m])",
+          "expr": "avg_over_time(waku_messages_sent_total_count[10m])",
           "fullMetaSearch": false,
           "includeNullMetadata": false,
           "interval": "",