diff --git a/helm/taskplaner/templates/servicemonitor.yaml b/helm/taskplaner/templates/servicemonitor.yaml
new file mode 100644
index 0000000..1e698fe
--- /dev/null
+++ b/helm/taskplaner/templates/servicemonitor.yaml
@@ -0,0 +1,19 @@
+{{- if .Values.metrics.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "taskplaner.fullname" . }}
+  labels:
+    {{- include "taskplaner.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "taskplaner.selectorLabels" . | nindent 6 }}
+  endpoints:
+    - port: http
+      path: /metrics
+      interval: {{ .Values.metrics.interval | default "30s" }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+{{- end }}
diff --git a/helm/taskplaner/values.yaml b/helm/taskplaner/values.yaml
index e7e8544..0572bfa 100644
--- a/helm/taskplaner/values.yaml
+++ b/helm/taskplaner/values.yaml
@@ -111,6 +111,11 @@ basicAuth:
   # Example: "admin:$apr1$xyz..."
   htpasswd: ""
 
+# Prometheus metrics
+metrics:
+  enabled: true
+  interval: 30s
+
 # Application-specific configuration
 config:
   # The external URL where the app is accessible (required for CSRF protection)