diff --git a/batcher/aligned-batcher/src/metrics.rs b/batcher/aligned-batcher/src/metrics.rs
index 231a4795f..a7c6f26e3 100644
--- a/batcher/aligned-batcher/src/metrics.rs
+++ b/batcher/aligned-batcher/src/metrics.rs
@@ -25,22 +25,25 @@ impl BatcherMetrics {
     pub fn start(metrics_port: u16) -> anyhow::Result<Self> {
         let registry = prometheus::Registry::new();
 
-        let open_connections = register_int_gauge!(opts!("open_connections", "Open Connections"))?;
-        let received_proofs = register_int_counter!(opts!("received_proofs", "Received Proofs"))?;
-        let sent_batches = register_int_counter!(opts!("sent_batches", "Sent Batches"))?;
+        let open_connections =
+            register_int_gauge!(opts!("open_connections_count", "Open Connections"))?;
+        let received_proofs =
+            register_int_counter!(opts!("received_proofs_count", "Received Proofs"))?;
+        let sent_batches = register_int_counter!(opts!("sent_batches_count", "Sent Batches"))?;
         let reverted_batches =
-            register_int_counter!(opts!("reverted_batches", "Reverted Batches"))?;
+            register_int_counter!(opts!("reverted_batches_count", "Reverted Batches"))?;
         let canceled_batches =
-            register_int_counter!(opts!("canceled_batches", "Canceled Batches"))?;
+            register_int_counter!(opts!("canceled_batches_count", "Canceled Batches"))?;
         let user_errors = register_int_counter_vec!(
-            opts!("user_errors", "User Errors"),
+            opts!("user_errors_count", "User Errors"),
             &["error_type", "proving_system"]
         )?;
-        let batcher_started = register_int_counter!(opts!("batcher_started", "Batcher Started"))?;
+        let batcher_started =
+            register_int_counter!(opts!("batcher_started_count", "Batcher Started"))?;
         let gas_price_used_on_latest_batch =
             register_int_gauge!(opts!("gas_price_used_on_latest_batch", "Gas Price"))?;
         let broken_ws_connections = register_int_counter!(opts!(
-            "broken_ws_connections",
+            "broken_ws_connections_count",
             "Broken websocket connections"
         ))?;
 
diff --git a/grafana/provisioning/dashboards/aligned/aggregator_batcher.json b/grafana/provisioning/dashboards/aligned/aggregator_batcher.json
index fc1c08723..929ff29ea 100644
--- a/grafana/provisioning/dashboards/aligned/aggregator_batcher.json
+++ b/grafana/provisioning/dashboards/aligned/aggregator_batcher.json
@@ -18,7 +18,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 2,
+  "id": 4,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -43,7 +43,7 @@
         "content": "<h1 style=\"background-color: #00A86B; color: white; padding: 10px; border-radius: 0px; text-align: center;\">\n  ETHEREUM\n</h1>",
         "mode": "html"
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "transparent": true,
       "type": "text"
     },
@@ -68,7 +68,7 @@
         "content": "<h1 style=\"background-color: #00A86B; color: white; padding: 10px; border-radius: 0px; text-align: center;\">\n  HISTORIC DATA\n</h1>",
         "mode": "html"
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "transparent": true,
       "type": "text"
     },
@@ -85,7 +85,6 @@
             "fixedColor": "green",
             "mode": "fixed"
           },
-          "fieldMinMax": false,
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -128,7 +127,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -166,14 +165,12 @@
             "mode": "fixed"
           },
           "custom": {
-            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "axisSoftMin": 2,
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -199,7 +196,6 @@
               "mode": "off"
             }
           },
-          "fieldMinMax": false,
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -307,7 +303,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -315,8 +311,8 @@
             "uid": "prometheus"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "floor(increase(received_proofs{job=\"aligned-batcher\"}[10y]))",
+          "editorMode": "code",
+          "expr": "floor(increase(received_proofs_count{job=\"aligned-batcher\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -331,7 +327,6 @@
     },
     {
       "datasource": {
-        "default": true,
         "type": "prometheus",
         "uid": "prometheus"
       },
@@ -385,7 +380,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -394,7 +389,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(sent_batches{job=\"aligned-batcher\"}[10y]))",
+          "expr": "floor(increase(sent_batches_count{job=\"aligned-batcher\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -456,7 +451,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -480,7 +475,6 @@
     },
     {
       "datasource": {
-        "default": true,
         "type": "prometheus",
         "uid": "prometheus"
       },
@@ -490,13 +484,11 @@
             "mode": "palette-classic"
           },
           "custom": {
-            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -632,7 +624,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -640,8 +632,8 @@
             "uid": "prometheus"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "floor(increase(aligned_aggregator_received_tasks{bot=\"aggregator\"}[10y]))",
+          "editorMode": "code",
+          "expr": "floor(increase(aligned_aggregator_received_tasks_count{bot=\"aggregator\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -701,7 +693,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -709,9 +701,9 @@
             "uid": "prometheus"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "floor(increase(aligned_aggregated_responses{bot=\"aggregator\"}[10y]))",
+          "expr": "floor(increase(aligned_aggregated_responses_count{bot=\"aggregator\"}[10y]))",
           "format": "table",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -728,7 +720,6 @@
     },
     {
       "datasource": {
-        "default": true,
         "type": "prometheus",
         "uid": "prometheus"
       },
@@ -776,7 +767,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -785,7 +776,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "increase(aligned_aggregator_gas_cost_paid_for_batcher{bot=\"aggregator\"}[10y])",
+          "expr": "increase(aligned_aggregator_gas_cost_paid_for_batcher_sum{bot=\"aggregator\"}[10y])",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -800,7 +791,6 @@
     },
     {
       "datasource": {
-        "default": true,
         "type": "prometheus",
         "uid": "prometheus"
       },
@@ -847,7 +837,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -856,7 +846,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(aligned_aggregator_num_times_paid_for_batcher{bot=\"aggregator\"}[10y]))",
+          "expr": "floor(increase(aligned_aggregator_num_times_paid_for_batcher_count{bot=\"aggregator\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -890,7 +880,7 @@
         "content": "<h1 style=\"background-color: #00A86B; color: white; padding: 10px; border-radius: 0px; text-align: center;\">\n  SYSTEM STATUS\n</h1>",
         "mode": "html"
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "transparent": true,
       "type": "text"
     },
@@ -943,7 +933,7 @@
         "showThresholdMarkers": true,
         "sizing": "auto"
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -951,8 +941,8 @@
             "uid": "prometheus"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "open_connections{job=\"aligned-batcher\"}",
+          "editorMode": "code",
+          "expr": "open_connections_count{job=\"aligned-batcher\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -967,7 +957,6 @@
     },
     {
       "datasource": {
-        "default": true,
         "type": "prometheus",
         "uid": "prometheus"
       },
@@ -1025,7 +1014,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -1035,7 +1024,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "floor(increase(aligned_aggregator_received_tasks{job=\"aligned-aggregator\"}[$__range]))",
+          "expr": "floor(increase(aligned_aggregator_received_tasks_count{job=\"aligned-aggregator\"}[$__range]))",
           "fullMetaSearch": false,
           "hide": true,
           "includeNullMetadata": true,
@@ -1053,7 +1042,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(aligned_aggregated_responses{job=\"aligned-aggregator\"}[$__range]))",
+          "expr": "floor(increase(aligned_aggregated_responses_count{job=\"aligned-aggregator\"}[$__range]))",
           "fullMetaSearch": false,
           "hide": true,
           "includeNullMetadata": true,
@@ -1101,7 +1090,6 @@
     },
     {
       "datasource": {
-        "default": true,
         "type": "prometheus",
         "uid": "prometheus"
       },
@@ -1151,7 +1139,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -1160,7 +1148,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(batcher_started{job=\"aligned-batcher\"}[10y]))",
+          "expr": "floor(increase(batcher_started_count{job=\"aligned-batcher\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1175,7 +1163,6 @@
     },
     {
       "datasource": {
-        "default": true,
         "type": "prometheus",
         "uid": "prometheus"
       },
@@ -1185,13 +1172,11 @@
             "mode": "palette-classic"
           },
           "custom": {
-            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -1262,7 +1247,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(batcher_started{job=\"aligned-batcher\"}[10y]))",
+          "expr": "floor(increase(batcher_started_count{job=\"aligned-batcher\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1296,7 +1281,7 @@
         "content": "<h1 style=\"background-color: #00A86B; color: black; padding: 10px; border-radius: 0px; text-align: center;\">\n  SYSTEM STATUS\n</h1>",
         "mode": "html"
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "transparent": true,
       "type": "text"
     },
@@ -1321,7 +1306,7 @@
         "content": "<h1 style=\"background-color: #00A86B; color: white; padding: 10px; border-radius: 0px; text-align: center;\">\n  BATCHER\n</h1>",
         "mode": "html"
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "transparent": true,
       "type": "text"
     },
@@ -1346,7 +1331,7 @@
         "content": "<h1 style=\"background-color: #00A86B; color: white; padding: 10px; border-radius: 0px; text-align: center;\">\n  AGGREGATOR\n</h1>",
         "mode": "html"
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "transparent": true,
       "type": "text"
     },
@@ -1405,7 +1390,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -1414,7 +1399,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(sent_batches{job=\"aligned-batcher\"}[$__range]))",
+          "expr": "floor(increase(sent_batches_count{job=\"aligned-batcher\"}[$__range]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1438,13 +1423,11 @@
             "mode": "palette-classic"
           },
           "custom": {
-            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -1514,7 +1497,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(sent_batches{job=\"aligned-batcher\"}[10y]))",
+          "expr": "floor(increase(sent_batches_count{job=\"aligned-batcher\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1575,7 +1558,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -1583,8 +1566,8 @@
             "uid": "prometheus"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "floor(increase(aligned_aggregator_received_tasks{bot=\"aggregator\"}[$__range]))",
+          "editorMode": "code",
+          "expr": "floor(increase(aligned_aggregator_received_tasks_count{bot=\"aggregator\"}[$__range]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1608,13 +1591,11 @@
             "mode": "palette-classic"
           },
           "custom": {
-            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -1684,8 +1665,8 @@
             "uid": "prometheus"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "floor(increase(aligned_aggregated_responses{bot=\"aggregator\"}[10y]))",
+          "editorMode": "code",
+          "expr": "floor(increase(aligned_aggregated_responses_count{bot=\"aggregator\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1753,7 +1734,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -1762,7 +1743,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(reverted_batches{job=\"aligned-batcher\"}[$__range]))",
+          "expr": "floor(increase(reverted_batches_count{job=\"aligned-batcher\"}[$__range]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1786,13 +1767,11 @@
             "mode": "palette-classic"
           },
           "custom": {
-            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -1861,8 +1840,8 @@
             "uid": "prometheus"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "floor(increase(reverted_batches{job=\"aligned-batcher\"}[10y]))",
+          "editorMode": "code",
+          "expr": "floor(increase(reverted_batches_count{job=\"aligned-batcher\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1922,7 +1901,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -1930,9 +1909,9 @@
             "uid": "prometheus"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "floor(increase(aligned_aggregated_responses{bot=\"aggregator\"}[$__range]))",
+          "expr": "floor(increase(aligned_aggregated_responses_count{bot=\"aggregator\"}[$__range]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1947,7 +1926,6 @@
     },
     {
       "datasource": {
-        "default": true,
         "type": "prometheus",
         "uid": "prometheus"
       },
@@ -1957,13 +1935,11 @@
             "mode": "palette-classic"
           },
           "custom": {
-            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -2034,7 +2010,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(aligned_aggregator_received_tasks{bot=\"aggregator\"}[10y]))",
+          "expr": "floor(increase(aligned_aggregator_received_tasks_count{bot=\"aggregator\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -2049,7 +2025,6 @@
     },
     {
       "datasource": {
-        "default": true,
         "type": "prometheus",
         "uid": "prometheus"
       },
@@ -2103,7 +2078,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.2.2+security-01",
+      "pluginVersion": "10.1.10",
       "targets": [
         {
           "datasource": {
@@ -2112,7 +2087,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(canceled_batches{job=\"aligned-batcher\"}[$__range]))",
+          "expr": "floor(increase(canceled_batches_count{job=\"aligned-batcher\"}[$__range]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -2127,7 +2102,6 @@
     },
     {
       "datasource": {
-        "default": true,
         "type": "prometheus",
         "uid": "prometheus"
       },
@@ -2137,13 +2111,11 @@
             "mode": "palette-classic"
           },
           "custom": {
-            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -2213,7 +2185,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(canceled_batches{job=\"aligned-batcher\"}[10y]))",
+          "expr": "floor(increase(canceled_batches_count{job=\"aligned-batcher\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -2228,7 +2200,6 @@
     },
     {
       "datasource": {
-        "default": true,
         "type": "prometheus",
         "uid": "prometheus"
       },
@@ -2239,13 +2210,11 @@
             "mode": "palette-classic"
           },
           "custom": {
-            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -2316,7 +2285,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(aligned_respond_to_task_gas_price_bumped{bot=\"aggregator\"}[10y]))",
+          "expr": "floor(increase(aligned_respond_to_task_gas_price_bumped_count{bot=\"aggregator\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -2331,7 +2300,6 @@
     },
     {
       "datasource": {
-        "default": true,
         "type": "prometheus",
         "uid": "prometheus"
       },
@@ -2342,13 +2310,11 @@
             "mode": "palette-classic"
           },
           "custom": {
-            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -2419,7 +2385,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(broken_ws_connections{job=\"aligned-batcher\"}[10y]))",
+          "expr": "floor(increase(broken_ws_connections_count{job=\"aligned-batcher\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -2434,7 +2400,6 @@
     },
     {
       "datasource": {
-        "default": true,
         "type": "prometheus",
         "uid": "prometheus"
       },
@@ -2445,13 +2410,11 @@
             "mode": "palette-classic"
           },
           "custom": {
-            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -2517,7 +2480,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(aligned_aggregator_num_times_paid_for_batcher{bot=\"aggregator\"}[10y]))",
+          "expr": "floor(increase(aligned_aggregator_num_times_paid_for_batcher_count{bot=\"aggregator\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -2532,7 +2495,6 @@
     },
     {
       "datasource": {
-        "default": true,
         "type": "prometheus",
         "uid": "prometheus"
       },
@@ -2542,13 +2504,11 @@
             "mode": "palette-classic"
           },
           "custom": {
-            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
-            "barWidthFactor": 0.6,
             "drawStyle": "line",
             "fillOpacity": 0,
             "gradientMode": "none",
@@ -2618,7 +2578,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "floor(increase(user_errors{job=\"aligned-batcher\"}[10y]))",
+          "expr": "floor(increase(user_errors_count{job=\"aligned-batcher\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -2668,7 +2628,8 @@
     }
   ],
   "refresh": "5s",
-  "schemaVersion": 39,
+  "schemaVersion": 38,
+  "style": "dark",
   "tags": [],
   "templating": {
     "list": []
@@ -2681,6 +2642,6 @@
   "timezone": "browser",
   "title": "System Data",
   "uid": "aggregator",
-  "version": 8,
+  "version": 9,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/grafana/provisioning/dashboards/aligned/operator.json b/grafana/provisioning/dashboards/aligned/operator.json
index bb229c98a..3b5440982 100644
--- a/grafana/provisioning/dashboards/aligned/operator.json
+++ b/grafana/provisioning/dashboards/aligned/operator.json
@@ -18,7 +18,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 2,
+  "id": 3,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -76,9 +76,9 @@
             "uid": "prometheus"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "floor(increase(aligned_operator_responses{bot=\"operator\"}[10y]))",
+          "expr": "floor(increase(aligned_operator_responses_count{bot=\"operator\"}[10y]))",
           "format": "table",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -147,9 +147,9 @@
             "uid": "prometheus"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "floor(increase(aligned_operator_responses{bot=\"operator\"}[$__range]))",
+          "expr": "floor(increase(aligned_operator_responses_count{bot=\"operator\"}[$__range]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -247,18 +247,18 @@
             "uid": "prometheus"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "floor(increase(aligned_operator_responses{bot=\"operator\"}[10y]))",
+          "editorMode": "code",
+          "expr": "floor(increase(aligned_operator_responses_count{bot=\"operator\"}[10y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
-          "legendFormat": "__auto",
+          "legendFormat": "{{job}}",
           "range": true,
           "refId": "A",
           "useBackend": false
         }
       ],
-      "title": "Operator",
+      "title": "Operator Responses",
       "type": "timeseries"
     },
     {
@@ -319,7 +319,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "rate(aligned_operator_responses{bot=\"operator\"}[1m]) * 60",
+          "expr": "rate(aligned_operator_responses_count{bot=\"operator\"}[1m]) * 60",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -385,7 +385,7 @@
             "uid": "prometheus"
           },
           "editorMode": "code",
-          "expr": "rate(aligned_operator_responses{bot=\"operator\"}[1m])",
+          "expr": "rate(aligned_operator_responses_count{bot=\"operator\"}[1m])",
           "instant": false,
           "legendFormat": "__auto",
           "range": true,
@@ -481,7 +481,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "rate(aligned_operator_responses{bot=\"operator\"}[1m]) * 60",
+          "expr": "rate(aligned_operator_responses_count{bot=\"operator\"}[1m]) * 60",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -495,7 +495,7 @@
       "type": "timeseries"
     }
   ],
-  "refresh": "auto",
+  "refresh": "5s",
   "schemaVersion": 38,
   "style": "dark",
   "tags": [],
@@ -510,6 +510,6 @@
   "timezone": "browser",
   "title": "Operator Data",
   "uid": "operator",
-  "version": 3,
+  "version": 4,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/metrics/metrics.go b/metrics/metrics.go
index e76d83b7b..dda2f7a04 100644
--- a/metrics/metrics.go
+++ b/metrics/metrics.go
@@ -31,32 +31,32 @@ func NewMetrics(ipPortAddress string, reg prometheus.Registerer, logger logging.
 		logger:        logger,
 		numAggregatedResponses: promauto.With(reg).NewCounter(prometheus.CounterOpts{
 			Namespace: alignedNamespace,
-			Name:      "aggregated_responses",
+			Name:      "aggregated_responses_count",
 			Help:      "Number of aggregated responses sent to the Aligned Service Manager",
 		}),
 		numOperatorTaskResponses: promauto.With(reg).NewCounter(prometheus.CounterOpts{
 			Namespace: alignedNamespace,
-			Name:      "operator_responses",
+			Name:      "operator_responses_count",
 			Help:      "Number of proof verified by the operator and sent to the Aligned Service Manager",
 		}),
 		numAggregatorReceivedTasks: promauto.With(reg).NewCounter(prometheus.CounterOpts{
 			Namespace: alignedNamespace,
-			Name:      "aggregator_received_tasks",
+			Name:      "aggregator_received_tasks_count",
 			Help:      "Number of tasks received by the Service Manager",
 		}),
 		aggregatorGasCostPaidForBatcherTotal: promauto.With(reg).NewGauge(prometheus.GaugeOpts{
 			Namespace: alignedNamespace,
-			Name:      "aggregator_gas_cost_paid_for_batcher",
+			Name:      "aggregator_gas_cost_paid_for_batcher_sum",
 			Help:      "Accumulated gas cost the aggregator paid for the batcher when the tx cost was higher than the respondToTaskFeeLimit",
 		}),
 		aggregatorNumTimesPaidForBatcher: promauto.With(reg).NewCounter(prometheus.CounterOpts{
 			Namespace: alignedNamespace,
-			Name:      "aggregator_num_times_paid_for_batcher",
+			Name:      "aggregator_num_times_paid_for_batcher_count",
 			Help:      "Number of times the aggregator paid for the batcher when the tx cost was higher than the respondToTaskFeeLimit",
 		}),
 		numBumpedGasPriceForAggregatedResponse: promauto.With(reg).NewCounter(prometheus.CounterOpts{
 			Namespace: alignedNamespace,
-			Name:      "respond_to_task_gas_price_bumped",
+			Name:      "respond_to_task_gas_price_bumped_count",
 			Help:      "Number of times gas price was bumped while sending aggregated response",
 		}),
 	}