diff --git a/flux2/apps/monitoring/kube-prometheus-stack-flux-podmonitor.yaml b/flux2/apps/monitoring/kube-prometheus-stack-flux-podmonitor.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5784f179fb5a6f6437e01e15237988f194d26dae
--- /dev/null
+++ b/flux2/apps/monitoring/kube-prometheus-stack-flux-podmonitor.yaml
@@ -0,0 +1,22 @@
+# https://fluxcd.io/docs/guides/monitoring/
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: flux-system
+  namespace: flux-system
+  labels:
+    app.kubernetes.io/part-of: flux
+spec:
+  namespaceSelector:
+    matchNames:
+      - flux-system
+  selector:
+    matchExpressions:
+      - key: app
+        operator: In
+        values:
+          - helm-controller
+          - source-controller
+          - notification-controller
+  podMetricsEndpoints:
+    - targetPort: http-prom
diff --git a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
index 026880cf4faa181d23ab195301cd898dda648de0..8850786819a957280e64a9914eefec27cac3dd5c 100644
--- a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
+++ b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
@@ -102,9 +102,6 @@ data:
         scrapeInterval: "3m"
         evaluationInterval: "3m"
         retention: "30d"
-
-    #    replicas: 2
-    #    podAntiAffinity: "hard"
         storageSpec:
           volumeClaimTemplate:
             spec:
@@ -112,7 +109,6 @@ data:
               resources:
                 requests:
                   storage: 10Gi
-
         resources:
           limits:
             cpu: 1
@@ -120,6 +116,13 @@ data:
           requests:
             cpu: 300m
             memory: 1Gi
+        # Discover ALL custom serviceMonitors, podMonitors and prometheusrules,
+        # not only those with particular release labels set by
+        # kube-prometheus-stack
+        # https://stackoverflow.com/a/65648944
+        serviceMonitorSelectorNilUsesHelmValues: false
+        ruleSelectorNilUsesHelmValues: false
+        podMonitorSelectorNilUsesHelmValues: false
 
       ingress:
         enabled: true
diff --git a/flux2/apps/monitoring/kustomization.yaml b/flux2/apps/monitoring/kustomization.yaml
index 769a6eca285070904208ea019ef18dd57e7b5f38..8e7a05ae8c5ed7080a7c25a7884eb8195e1449bb 100644
--- a/flux2/apps/monitoring/kustomization.yaml
+++ b/flux2/apps/monitoring/kustomization.yaml
@@ -7,6 +7,7 @@ resources:
   - eventrouter-values-configmap.yaml
   - kube-prometheus-stack-release.yaml
   - kube-prometheus-stack-values-configmap.yaml
+  - kube-prometheus-stack-flux-podmonitor.yaml
   - loki-configmap.yaml
   - loki-release.yaml
   - loki-values-configmap.yaml