diff --git a/infra/values/grafana-values.yaml b/infra/values/grafana-values.yaml
index 49e5ee8..c702f26 100644
--- a/infra/values/grafana-values.yaml
+++ b/infra/values/grafana-values.yaml
@@ -166,7 +166,7 @@ dashboards:
                   },
                   "editorMode": "code",
                   "exemplar": false,
-                  "expr": "sum(trivy_image_vulnerabilities{severity=\"Unknown\", namespace=~\"$namespace\"})",
+                  "expr": "sum(trivy_vulnerability_id{severity=\"Unknown\", namespace=~\"$namespace\"})",
                   "instant": true,
                   "interval": "",
                   "legendFormat": "",
@@ -236,7 +236,7 @@ dashboards:
                   },
                   "editorMode": "code",
                   "exemplar": false,
-                  "expr": "sum(trivy_image_vulnerabilities{severity=\"Low\", namespace=~\"$namespace\"})",
+                  "expr": "sum(trivy_vulnerability_id{severity=\"Low\", namespace=~\"$namespace\"})",
                   "format": "time_series",
                   "hide": false,
                   "instant": true,
@@ -308,7 +308,7 @@ dashboards:
                   },
                   "editorMode": "code",
                   "exemplar": false,
-                  "expr": "sum(trivy_image_vulnerabilities{severity=\"Medium\", namespace=~\"$namespace\"})",
+                  "expr": "sum(trivy_vulnerability_id{severity=\"Medium\", namespace=~\"$namespace\"})",
                   "instant": true,
                   "interval": "",
                   "legendFormat": "",
@@ -378,7 +378,7 @@ dashboards:
                   },
                   "editorMode": "code",
                   "exemplar": false,
-                  "expr": "sum(trivy_image_vulnerabilities{severity=\"High\", namespace=~\"$namespace\"})",
+                  "expr": "sum(trivy_vulnerability_id{severity=\"High\", namespace=~\"$namespace\"})",
                   "instant": true,
                   "interval": "",
                   "legendFormat": "",
@@ -448,7 +448,7 @@ dashboards:
                   },
                   "editorMode": "code",
                   "exemplar": false,
-                  "expr": "sum(trivy_image_vulnerabilities{severity=\"Critical\", namespace=~\"$namespace\"})",
+                  "expr": "sum(trivy_vulnerability_id{severity=\"Critical\", namespace=~\"$namespace\"})",
                   "instant": true,
                   "interval": "",
                   "legendFormat": "",
@@ -518,7 +518,7 @@ dashboards:
                   },
                   "editorMode": "code",
                   "exemplar": false,
-                  "expr": "sum(trivy_image_vulnerabilities{namespace=~\"$namespace\"})",
+                  "expr": "sum(trivy_vulnerability_id{namespace=~\"$namespace\"})",
                   "instant": true,
                   "interval": "",
                   "legendFormat": "",
@@ -645,7 +645,7 @@ dashboards:
                   },
                   "editorMode": "code",
                   "exemplar": false,
-                  "expr": "sum(trivy_image_vulnerabilities{namespace=~\"$namespace\"}) by (namespace)",
+                  "expr": "sum(trivy_vulnerability_id{namespace=~\"$namespace\"}) by (namespace)",
                   "instant": false,
                   "interval": "",
                   "legendFormat": "{{namespace}}",
@@ -745,7 +745,7 @@ dashboards:
                   },
                   "editorMode": "code",
                   "exemplar": false,
-                  "expr": "sum(trivy_image_vulnerabilities{namespace=~\"$namespace\"}) by (severity)",
+                  "expr": "sum(trivy_vulnerability_id{namespace=~\"$namespace\"}) by (severity)",
                   "instant": false,
                   "interval": "",
                   "legendFormat": "{{severity}}",
@@ -882,7 +882,7 @@ dashboards:
                   },
                   "editorMode": "code",
                   "exemplar": false,
-                  "expr": "sum(trivy_image_vulnerabilities{namespace=~\"$namespace\"}) without (instance, job, endpoint, service, container)",
+                  "expr": "sum(trivy_vulnerability_id{namespace=~\"$namespace\"}) without (instance, job, endpoint, service, container)",
                   "format": "table",
                   "instant": true,
                   "interval": "",
@@ -947,7 +947,7 @@ dashboards:
                   "type": "prometheus",
                   "uid": "PBFA97CFB590B2093"
                 },
-                "definition": "label_values(trivy_image_vulnerabilities{job=\"trivy-operator\"}, namespace)",
+                "definition": "label_values(trivy_vulnerability_id{job=\"trivy-operator\"}, namespace)",
                 "hide": 0,
                 "includeAll": false,
                 "label": "namespace",
@@ -955,7 +955,7 @@ dashboards:
                 "name": "namespace",
                 "options": [],
                 "query": {
-                  "query": "label_values(trivy_image_vulnerabilities{job=\"trivy-operator\"}, namespace)",
+                  "query": "label_values(trivy_vulnerability_id{job=\"trivy-operator\"}, namespace)",
                   "refId": "StandardVariableQuery"
                 },
                 "refresh": 2,