diff --git a/apps/monitor/kube-prometheus-stack/kustomization.yaml b/apps/monitor/kube-prometheus-stack/kustomization.yaml
index d07af14..464de1b 100644
--- a/apps/monitor/kube-prometheus-stack/kustomization.yaml
+++ b/apps/monitor/kube-prometheus-stack/kustomization.yaml
@@ -4,6 +4,8 @@ namespace: monitoring
 resources:
   - repository.yaml
   - release.yaml
+  - podmonitor-gitops-system.yaml
+  - podmonitor-ingress.yaml
 configMapGenerator:
   - name: flux-kube-state-metrics-config
     files:
diff --git a/clusters/devops/podmonitor.yaml b/apps/monitor/kube-prometheus-stack/podmonitor-gitops-system.yaml
similarity index 100%
rename from clusters/devops/podmonitor.yaml
rename to apps/monitor/kube-prometheus-stack/podmonitor-gitops-system.yaml
diff --git a/alerts/gitops/podmonitor.yaml b/apps/monitor/kube-prometheus-stack/podmonitor-ingress.yaml
similarity index 55%
rename from alerts/gitops/podmonitor.yaml
rename to apps/monitor/kube-prometheus-stack/podmonitor-ingress.yaml
index d338f1f..7aefd10 100644
--- a/alerts/gitops/podmonitor.yaml
+++ b/apps/monitor/kube-prometheus-stack/podmonitor-ingress.yaml
@@ -1,27 +1,23 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  name: flux-system
+  name: nginx
+  namespace: ingress
   labels:
-    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/component: monitoring
+    app.kubernetes.io/part-of: nginx
+    app.kubernetes.io/component: ingress
 spec:
   namespaceSelector:
     matchNames:
-      - flux-system
+      - ingress
   selector:
     matchExpressions:
       - key: app
         operator: In
         values:
-          - helm-controller
-          - source-controller
-          - kustomize-controller
-          - notification-controller
-          - image-automation-controller
-          - image-reflector-controller
+          - nginx
   podMetricsEndpoints:
-    - port: http-prom
+    - port: "9113"
       relabelings:
         # https://github.com/prometheus-operator/prometheus-operator/issues/4816
         - sourceLabels: [__meta_kubernetes_pod_phase]
diff --git a/clusters/devops/kustomization.yaml b/clusters/devops/kustomization.yaml
index 7c0b1b4..e18538d 100644
--- a/clusters/devops/kustomization.yaml
+++ b/clusters/devops/kustomization.yaml
@@ -5,7 +5,6 @@ resources:
   - ../../apps/monitor/observability-agent/
   - ../../apps/monitor/kube-prometheus-stack/
   - ../../apps/monitor/flagger/
-  - podmonitor.yaml
   - ../../apps/c-demo/
   - ../../apps/js-demo/
   - ../../apps/python-demo/
diff --git a/clusters/prod/kustomization.yaml b/clusters/prod/kustomization.yaml
index 7c0b1b4..e18538d 100644
--- a/clusters/prod/kustomization.yaml
+++ b/clusters/prod/kustomization.yaml
@@ -5,7 +5,6 @@ resources:
   - ../../apps/monitor/observability-agent/
   - ../../apps/monitor/kube-prometheus-stack/
   - ../../apps/monitor/flagger/
-  - podmonitor.yaml
   - ../../apps/c-demo/
   - ../../apps/js-demo/
   - ../../apps/python-demo/
diff --git a/clusters/prod/podmonitor.yaml b/clusters/prod/podmonitor.yaml
deleted file mode 100644
index 9e5f8d3..0000000
--- a/clusters/prod/podmonitor.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: PodMonitor
-metadata:
-  name: gitops-system
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/component: monitoring
-spec:
-  namespaceSelector:
-    matchNames:
-      - gitops-system
-  selector:
-    matchExpressions:
-      - key: app
-        operator: In
-        values:
-          - helm-controller
-          - source-controller
-          - kustomize-controller
-          - notification-controller
-          - image-automation-controller
-          - image-reflector-controller
-  podMetricsEndpoints:
-    - port: "8080"
-      relabelings:
-        # https://github.com/prometheus-operator/prometheus-operator/issues/4816
-        - sourceLabels: [__meta_kubernetes_pod_phase]
-          action: keep
-          regex: Running
diff --git a/clusters/sit/kustomization.yaml b/clusters/sit/kustomization.yaml
index 7c0b1b4..e18538d 100644
--- a/clusters/sit/kustomization.yaml
+++ b/clusters/sit/kustomization.yaml
@@ -5,7 +5,6 @@ resources:
   - ../../apps/monitor/observability-agent/
   - ../../apps/monitor/kube-prometheus-stack/
   - ../../apps/monitor/flagger/
-  - podmonitor.yaml
   - ../../apps/c-demo/
   - ../../apps/js-demo/
   - ../../apps/python-demo/
diff --git a/clusters/sit/podmonitor.yaml b/clusters/sit/podmonitor.yaml
deleted file mode 100644
index 9e5f8d3..0000000
--- a/clusters/sit/podmonitor.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: PodMonitor
-metadata:
-  name: gitops-system
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/component: monitoring
-spec:
-  namespaceSelector:
-    matchNames:
-      - gitops-system
-  selector:
-    matchExpressions:
-      - key: app
-        operator: In
-        values:
-          - helm-controller
-          - source-controller
-          - kustomize-controller
-          - notification-controller
-          - image-automation-controller
-          - image-reflector-controller
-  podMetricsEndpoints:
-    - port: "8080"
-      relabelings:
-        # https://github.com/prometheus-operator/prometheus-operator/issues/4816
-        - sourceLabels: [__meta_kubernetes_pod_phase]
-          action: keep
-          regex: Running
diff --git a/clusters/uat/kustomization.yaml b/clusters/uat/kustomization.yaml
index 7c0b1b4..e18538d 100644
--- a/clusters/uat/kustomization.yaml
+++ b/clusters/uat/kustomization.yaml
@@ -5,7 +5,6 @@ resources:
   - ../../apps/monitor/observability-agent/
   - ../../apps/monitor/kube-prometheus-stack/
   - ../../apps/monitor/flagger/
-  - podmonitor.yaml
   - ../../apps/c-demo/
   - ../../apps/js-demo/
   - ../../apps/python-demo/
diff --git a/clusters/uat/podmonitor.yaml b/clusters/uat/podmonitor.yaml
deleted file mode 100644
index 9e5f8d3..0000000
--- a/clusters/uat/podmonitor.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: PodMonitor
-metadata:
-  name: gitops-system
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/component: monitoring
-spec:
-  namespaceSelector:
-    matchNames:
-      - gitops-system
-  selector:
-    matchExpressions:
-      - key: app
-        operator: In
-        values:
-          - helm-controller
-          - source-controller
-          - kustomize-controller
-          - notification-controller
-          - image-automation-controller
-          - image-reflector-controller
-  podMetricsEndpoints:
-    - port: "8080"
-      relabelings:
-        # https://github.com/prometheus-operator/prometheus-operator/issues/4816
-        - sourceLabels: [__meta_kubernetes_pod_phase]
-          action: keep
-          regex: Running