diff --git a/apps/immich/kustomization.yaml b/apps/immich/kustomization.yaml
index 8b5c7f2..4b0894f 100644
--- a/apps/immich/kustomization.yaml
+++ b/apps/immich/kustomization.yaml
@@ -6,6 +6,7 @@ resources:
   - pvc.yaml
   - postgres.yaml
   - postgres.sealedsecret.yaml
+  - servicemonitor.yaml
 
 
 namespace: immich
diff --git a/apps/immich/servicemonitor.yaml b/apps/immich/servicemonitor.yaml
new file mode 100644
index 0000000..6e5564f
--- /dev/null
+++ b/apps/immich/servicemonitor.yaml
@@ -0,0 +1,14 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: immich-service-monitor
+spec:
+  endpoints:
+  - port: metrics-api
+    scheme: http
+  - port: metrics-ms
+    scheme: http
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: server
+      app.kubernetes.io/service: immich-server
diff --git a/infrastructure/monitoring/prometheus-node-exporter.values.yaml b/infrastructure/monitoring/prometheus-node-exporter.values.yaml
index 8e17d39..ac90a2f 100644
--- a/infrastructure/monitoring/prometheus-node-exporter.values.yaml
+++ b/infrastructure/monitoring/prometheus-node-exporter.values.yaml
@@ -3,6 +3,10 @@ prometheus:
     enabled: true
 
     jobLabel: "node-exporter"
+    selectorOverride:
+      app.kubernetes.io/name: prometheus-node-exporter
+      app.kubernetes.io/part-of: prometheus-node-exporter
+
 
   
 resources: