diff --git a/src/main/helm/templates/service_monitor.yaml b/src/main/helm/templates/service_monitor.yaml
index 29e7125bbb9d391b3cf0081ab78ed17e643a1d79..66ec606c670a1b4b3537f63486fe49ed90652205 100644
--- a/src/main/helm/templates/service_monitor.yaml
+++ b/src/main/helm/templates/service_monitor.yaml
@@ -36,7 +36,7 @@ metadata:
 spec:
   endpoints:
   - interval: 30s
-    targetPort: 8080
+    targetPort: metrics
     path: /q/metrics
     scheme: http
   namespaceSelector:
diff --git a/src/test/helm/service_monitor_test.yaml b/src/test/helm/service_monitor_test.yaml
index 32b0cf3ec13546a57baf0a3f0e4cae341cf4f298..38f07ce0319aba447fcde7c1ee8069a9b4525157 100644
--- a/src/test/helm/service_monitor_test.yaml
+++ b/src/test/helm/service_monitor_test.yaml
@@ -71,7 +71,7 @@ tests:
             interval: 30s
             path: /q/metrics
             scheme: http
-            targetPort: 8080
+            targetPort: metrics
   - it: namespace selector should contain the namespace
     asserts:
       - contains: