diff --git a/apps/immich/postgres.yaml b/apps/immich/postgres.yaml
index 50a141f..21bec95 100644
--- a/apps/immich/postgres.yaml
+++ b/apps/immich/postgres.yaml
@@ -21,14 +21,5 @@ spec:
     size: 1Gi
     storageClass: nfs-client
 
----
-apiVersion: monitoring.coreos.com/v1
-kind: PodMonitor
-metadata:
-  name: postgres-exporter
-spec:
-  selector:
-    matchLabels:
-      "cnpg.io/cluster": immich-postgres
-  podMetricsEndpoints:
-  - port: metrics
+  monitoring:
+    enablePodMonitor: true
diff --git a/apps/media/jellyfin.servicemonitor.yaml b/apps/media/jellyfin.servicemonitor.yaml
index aef142c..d71f230 100644
--- a/apps/media/jellyfin.servicemonitor.yaml
+++ b/apps/media/jellyfin.servicemonitor.yaml
@@ -7,10 +7,10 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: jellyfin-server
+      app: jellyfin-server-service
   endpoints:
   - path: /metrics
-    targetPort: "8096"
+    targetPort: jellyfin
 
 # this exposes metrics on port 8096 as enabled in the jellyfin config
 # https://jellyfin.org/docs/general/networking/monitoring/
diff --git a/apps/media/server.deployment.yaml b/apps/media/server.deployment.yaml
index c273878..0168fa7 100644
--- a/apps/media/server.deployment.yaml
+++ b/apps/media/server.deployment.yaml
@@ -20,6 +20,7 @@ spec:
             cpu: "2"
         ports:
         - containerPort: 8096
+          name: jellyfin
         env:
         - name: TZ
           value: Europe/Berlin
diff --git a/apps/media/server.service.yaml b/apps/media/server.service.yaml
index 521ca4a..23a942c 100644
--- a/apps/media/server.service.yaml
+++ b/apps/media/server.service.yaml
@@ -3,6 +3,8 @@ apiVersion: v1
 kind: Service
 metadata:
   name: jellyfin-server
+  labels:
+    app: jellyfin-server-service
 spec:
   selector:
     app: jellyfin-server