diff --git a/ansible/roles/k3s-exporter/files/prometheus/prometheus-crd.yaml b/ansible/roles/k3s-exporter/files/prometheus/prometheus-crd.yaml
index 8d43de34..2fd05f67 100644
--- a/ansible/roles/k3s-exporter/files/prometheus/prometheus-crd.yaml
+++ b/ansible/roles/k3s-exporter/files/prometheus/prometheus-crd.yaml
@@ -158,6 +158,10 @@ spec:
                 action: replace
                 target_label: serviceFunction
                 regex: (.+)
+              - source_labels: [__meta_kubernetes_pod_label_component]
+                action: replace
+                target_label: component
+                regex: (.+)
 
               - source_labels: [__meta_kubernetes_pod_phase]
                 regex: Pending|Succeeded|Failed|Completed
diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml
index 4a711618..0a5aae00 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml
@@ -21,6 +21,7 @@ spec:
         app: {{ .Release.Name }}-firewall
         vsysId: "{{ .Values.vsys_id }}"
         serviceFunction: {{ .Release.Name }}
+        component: firewall
       annotations:
         prometheus.io/port: "9273"
         prometheus.io/scrape: "true"
diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml
index 9d211318..74c5b3ac 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ .Release.Name }}-proxy
   labels:
     app: {{ .Release.Name }}
-    component: firewall
+    component: proxy
   annotations:
     reloader.stakater.com/auto: "true"
 
@@ -22,6 +22,7 @@ spec:
         app: {{ .Release.Name }}-proxy
         vsysId: "{{ .Values.vsys_id }}"
         serviceFunction: {{ .Release.Name }}
+        component: proxy
       annotations:
         prometheus.io/port: "9001"
         prometheus.io/scrape: "true"
diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-service-chaining.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-service-chaining.yaml
index f051416e..0ca5838d 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/deployment-service-chaining.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-service-chaining.yaml
@@ -22,6 +22,7 @@ spec:
         app: {{ .Release.Name }}-service-chaining
         vsysId: "{{ .Values.vsys_id }}"
         serviceFunction: {{ .Release.Name }}
+        component: service-chaining
       annotations:
         prometheus.io/port: "9006"
         prometheus.io/scrape: "true"
diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml
index 93535caa..bc08ab79 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml
@@ -22,6 +22,7 @@ spec:
         app: {{ .Release.Name }}-shaping
         vsysId: "{{ .Values.vsys_id }}"
         serviceFunction: {{ .Release.Name }}
+        component: shaping
       annotations:
         prometheus.io/port: "9007"
         prometheus.io/scrape: "true"