diff --git a/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumAgent.yaml b/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumAgent.yaml
index 0acdd167af..13b2840de4 100644
--- a/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumAgent.yaml
+++ b/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumAgent.yaml
@@ -1,8 +1,14 @@
 {{$PROMETHEUS_SCRAPE_CILIUM_AGENT := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT false}}
 {{$PROMETHEUS_SCRAPE_CILIUM_AGENT_PORT := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_PORT "prometheus"}}
 {{$PROMETHEUS_SCRAPE_CILIUM_AGENT_INTERVAL := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_INTERVAL "30s"}}
+{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE false}}
+{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_METRIC_KEEP_LIST := DefaultParam .PROMETHEUS_SCRAPE_CILIUM_AGENT_METRIC_KEEP_LIST "(.*)"}}
+{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_PORT := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_PORT 9965}}
+{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_INTERVAL := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_INTERVAL "30s"}}
+{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_METRIC_KEEP_LIST := DefaultParam .PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_METRIC_KEEP_LIST "(.*)"}}
 
-{{if $PROMETHEUS_SCRAPE_CILIUM_AGENT }}
+
+{{if or $PROMETHEUS_SCRAPE_CILIUM_AGENT $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE }}
 
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
@@ -13,8 +19,22 @@ metadata:
   namespace: monitoring
 spec:
   podMetricsEndpoints:
+{{if $PROMETHEUS_SCRAPE_CILIUM_AGENT }}
     - interval: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_INTERVAL }}
-      port: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_PORT }}
+      port: "{{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_PORT }}"
+      metricRelabelings:
+        - sourceLabels: [__name__]
+          regex: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_METRIC_KEEP_LIST }}
+          action: keep
+{{end}}
+{{if $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE }}
+    - interval: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_INTERVAL }}
+      port: "{{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_PORT }}"
+      metricRelabelings:
+        - sourceLabels: [__name__]
+          regex: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_HUBBLE_METRIC_KEEP_LIST }}
+          action: keep
+{{end}}
   jobLabel: k8s-app
   selector:
     matchLabels:
diff --git a/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumStandaloneDNSProxy.yaml b/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumStandaloneDNSProxy.yaml
new file mode 100644
index 0000000000..497c49b2fc
--- /dev/null
+++ b/clusterloader2/pkg/prometheus/manifests/default/prometheus-podMonitorCiliumStandaloneDNSProxy.yaml
@@ -0,0 +1,31 @@
+{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_PORT := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_PORT 9961}}
+{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_INTERVAL := DefaultParam .CL2_PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_INTERVAL "30s"}}
+{{$PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_METRIC_KEEP_LIST := DefaultParam .PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_METRIC_KEEP_LIST "(.*)"}}
+
+{{if $PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY}}
+
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  labels:
+    k8s-app: acns-security-agent
+  name: cilium-standalone-dns-proxy
+  namespace: monitoring
+spec:
+  podMetricsEndpoints:
+{{if $PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY }}
+    - interval: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_INTERVAL }}
+      port: "{{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_PORT }}"
+      metricRelabelings:
+        - sourceLabels: [__name__]
+          regex: {{ $PROMETHEUS_SCRAPE_CILIUM_AGENT_STANDALONE_DNS_PROXY_METRIC_KEEP_LIST }}
+          action: keep
+{{end}}
+  jobLabel: k8s-app
+  selector:
+    matchLabels:
+      k8s-app: acns-security-agent
+  namespaceSelector:
+    matchNames:
+      - kube-system
+{{end}}