diff --git a/.rhcicd/grafana/grafana-dashboard-notifications-general.configmap.yaml b/.rhcicd/grafana/grafana-dashboard-notifications-general.configmap.yaml
index 4901866b02..c83d3c1603 100644
--- a/.rhcicd/grafana/grafana-dashboard-notifications-general.configmap.yaml
+++ b/.rhcicd/grafana/grafana-dashboard-notifications-general.configmap.yaml
@@ -3190,7 +3190,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "sum(increase(CamelExchangesSucceeded_total{service=\"notifications-connector-google-chat-service\", routeId=\"google_chat\"}[5m]))",
+              "expr": "sum(increase(camel_exchanges_succeeded_total{service=\"notifications-connector-google-chat-service\", routeId=\"google_chat\"}[5m]))",
               "instant": false,
               "legendFormat": "Success",
               "range": true,
@@ -3202,7 +3202,7 @@ data:
                 "uid": "$datasource"
               },
               "editorMode": "code",
-              "expr": "sum(increase(CamelExchangesFailuresHandled_total{service=\"notifications-connector-google-chat-service\", routeId=\"google_chat\"}[5m]))",
+              "expr": "sum(increase(camel_exchanges_failures_handled_total{service=\"notifications-connector-google-chat-service\", routeId=\"google_chat\"}[5m]))",
               "hide": false,
               "interval": "",
               "legendFormat": "Failure",
@@ -3356,7 +3356,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "sum(increase(CamelExchangesSucceeded_total{service=\"notifications-connector-microsoft-teams-service\", routeId=\"teams\"}[5m]))",
+              "expr": "sum(increase(camel_exchanges_succeeded_total{service=\"notifications-connector-microsoft-teams-service\", routeId=\"teams\"}[5m]))",
               "instant": false,
               "legendFormat": "Success",
               "range": true,
@@ -3368,7 +3368,7 @@ data:
                 "uid": "$datasource"
               },
               "editorMode": "code",
-              "expr": "sum(increase(CamelExchangesFailuresHandled_total{service=\"notifications-connector-microsoft-teams-service\", routeId=\"teams\"}[5m]))",
+              "expr": "sum(increase(camel_exchanges_failures_handled_total{service=\"notifications-connector-microsoft-teams-service\", routeId=\"teams\"}[5m]))",
               "hide": false,
               "interval": "",
               "legendFormat": "Failure",
@@ -3521,7 +3521,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "sum(increase(CamelExchangesSucceeded_total{service=\"notifications-connector-servicenow-service\", routeId=\"servicenow\"}[5m]))",
+              "expr": "sum(increase(camel_exchanges_succeeded_total{service=\"notifications-connector-servicenow-service\", routeId=\"servicenow\"}[5m]))",
               "instant": false,
               "legendFormat": "Success",
               "range": true,
@@ -3533,7 +3533,7 @@ data:
                 "uid": "$datasource"
               },
               "editorMode": "code",
-              "expr": "sum(increase(CamelExchangesFailuresHandled_total{service=\"notifications-connector-servicenow-service\", routeId=\"servicenow\"}[5m]))",
+              "expr": "sum(increase(camel_exchanges_failures_handled_total{service=\"notifications-connector-servicenow-service\", routeId=\"servicenow\"}[5m]))",
               "hide": false,
               "interval": "",
               "legendFormat": "Failure",
@@ -3687,7 +3687,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "sum(increase(CamelExchangesSucceeded_total{service=\"notifications-connector-slack-service\", routeId=\"slack\"}[5m]))",
+              "expr": "sum(increase(camel_exchanges_succeeded_total{service=\"notifications-connector-slack-service\", routeId=\"slack\"}[5m]))",
               "instant": false,
               "legendFormat": "Success",
               "range": true,
@@ -3699,7 +3699,7 @@ data:
                 "uid": "$datasource"
               },
               "editorMode": "code",
-              "expr": "sum(increase(CamelExchangesFailuresHandled_total{service=\"notifications-connector-slack-service\", routeId=\"slack\"}[5m]))",
+              "expr": "sum(increase(camel_exchanges_failures_handled_total{service=\"notifications-connector-slack-service\", routeId=\"slack\"}[5m]))",
               "hide": false,
               "interval": "",
               "legendFormat": "Failure",
@@ -3852,7 +3852,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "sum(increase(CamelExchangesSucceeded_total{service=\"notifications-connector-splunk-service\", routeId=\"splunk\"}[5m]))",
+              "expr": "sum(increase(camel_exchanges_succeeded_total{service=\"notifications-connector-splunk-service\", routeId=\"splunk\"}[5m]))",
               "instant": false,
               "legendFormat": "Success",
               "range": true,
@@ -3864,7 +3864,7 @@ data:
                 "uid": "$datasource"
               },
               "editorMode": "code",
-              "expr": "sum(increase(CamelExchangesFailuresHandled_total{service=\"notifications-connector-splunk-service\", routeId=\"splunk\"}[5m]))",
+              "expr": "sum(increase(camel_exchanges_failures_handled_total{service=\"notifications-connector-splunk-service\", routeId=\"splunk\"}[5m]))",
               "hide": false,
               "interval": "",
               "legendFormat": "Failure",
@@ -4183,7 +4183,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "sum(increase(CamelExchangesSucceeded_total{service=\"notifications-connector-webhook-service\", routeId=\"webhook\"}[5m]))",
+              "expr": "sum(increase(camel_exchanges_succeeded_total{service=\"notifications-connector-webhook-service\", routeId=\"webhook\"}[5m]))",
               "instant": false,
               "legendFormat": "Success",
               "range": true,
@@ -4195,7 +4195,7 @@ data:
                 "uid": "$datasource"
               },
               "editorMode": "code",
-              "expr": "sum(increase(CamelExchangesFailuresHandled_total{service=\"notifications-connector-webhook-service\", routeId=\"webhook\"}[5m]))",
+              "expr": "sum(increase(camel_exchanges_failures_handled_total{service=\"notifications-connector-webhook-service\", routeId=\"webhook\"}[5m]))",
               "hide": false,
               "interval": "",
               "legendFormat": "Failure",
@@ -6012,7 +6012,7 @@ data:
       "timezone": "",
       "title": "Notifications Dashboard",
       "uid": "KQIVyFuMk",
-      "version": 2,
+      "version": 1,
       "weekStart": ""
     }
 kind: ConfigMap