diff --git a/apps/syncthing/servicemonitor.yaml b/apps/syncthing/servicemonitor.yaml
index 2983815..2310310 100644
--- a/apps/syncthing/servicemonitor.yaml
+++ b/apps/syncthing/servicemonitor.yaml
@@ -9,9 +9,8 @@ spec:
     matchLabels:
       app: syncthing
   endpoints:
-    - port: web
+    - port: syncthing-web
       path: /metrics
-      targetPort: syncthing-web
       bearerTokenSecret:
         name: syncthing-api
         key: token
diff --git a/infrastructure/traefik-system/servicemonitor.yaml b/infrastructure/traefik-system/servicemonitor.yaml
index 784c7cf..c741c6a 100644
--- a/infrastructure/traefik-system/servicemonitor.yaml
+++ b/infrastructure/traefik-system/servicemonitor.yaml
@@ -1,13 +1,29 @@
+# apiVersion: monitoring.coreos.com/v1
+# kind: ServiceMonitor
+# metadata:
+#   name: traefik-servicemonitor
+#   labels:
+#     app: traefik
+# spec:
+#   selector:
+#     matchLabels:
+#       app.kubernetes.io/name: traefik
+#   endpoints:
+#     - port: metrics
+#       path: /metrics
 apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
+kind: PodMonitor
 metadata:
-  name: traefik-servicemonitor
+  name: traefik-podmonitor
   labels:
     app: traefik
 spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: traefik
-  endpoints:
+  namespaceSelector:
+    matchNames:
+      - traefik-system
+  podMetricsEndpoints:
     - port: metrics
       path: /metrics