diff --git a/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/external-secret.yaml b/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/external-secret.yaml
index 3ce3502bd..d517e5e3e 100644
--- a/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/external-secret.yaml
+++ b/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/external-secret.yaml
@@ -6,9 +6,6 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/http-route.yaml b/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/http-route.yaml
index 49c813e66..71b754818 100644
--- a/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/http-route.yaml
+++ b/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-prometheus
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-prometheus
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   parentRefs:
     - group: gateway.networking.k8s.io
diff --git a/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/scrape-config.yaml b/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/scrape-config.yaml
index 21c7038a4..ce2233f65 100644
--- a/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/scrape-config.yaml
+++ b/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/scrape-config.yaml
@@ -4,11 +4,8 @@ metadata:
   name: external-nodes-http
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: external-nodes
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: metrics
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   staticConfigs:
     - labels:
@@ -26,11 +23,8 @@ metadata:
   name: external-nodes-https
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: external-nodes
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: metrics
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   staticConfigs:
     - labels:
diff --git a/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/service.yaml b/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/service.yaml
index aa75196ce..3afcca87d 100644
--- a/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/service.yaml
+++ b/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/service.yaml
@@ -4,11 +4,8 @@ metadata:
   name: node-ps10rp
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: node-ps10rp
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: tailscale
-    app.kubernetes.io/part-of: {{ .Release.Name }}
   annotations:
     tailscale.com/tailnet-fqdn: node-exporter-ps10rp.boreal-beaufort.ts.net
 spec:
diff --git a/clusters/cl01tl/monitoring/unpoller/Chart.yaml b/clusters/cl01tl/monitoring/unpoller/Chart.yaml
index 5b1957527..b0f085b7c 100644
--- a/clusters/cl01tl/monitoring/unpoller/Chart.yaml
+++ b/clusters/cl01tl/monitoring/unpoller/Chart.yaml
@@ -18,6 +18,6 @@ dependencies:
   - name: app-template
     alias: unpoller
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 3.7.3
+    version: 4.0.1
 icon: https://camo.githubusercontent.com/c5d07a5b3acfeac8e1c25bf56f440ffe032b86e4e7f15de82357f022a43fc927/68747470733a2f2f756e706f6c6c65722e636f6d2f696d672f6c6f676f2e706e67
 appVersion: v2.15.3
diff --git a/clusters/cl01tl/monitoring/unpoller/templates/external-secret.yaml b/clusters/cl01tl/monitoring/unpoller/templates/external-secret.yaml
index 434ad5f54..b77dd2112 100644
--- a/clusters/cl01tl/monitoring/unpoller/templates/external-secret.yaml
+++ b/clusters/cl01tl/monitoring/unpoller/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: unpoller-unifi-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: unpoller-unifi-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/monitoring/unpoller/templates/service-monitor.yaml b/clusters/cl01tl/monitoring/unpoller/templates/service-monitor.yaml
index f16f0fe6a..e8376ec2d 100644
--- a/clusters/cl01tl/monitoring/unpoller/templates/service-monitor.yaml
+++ b/clusters/cl01tl/monitoring/unpoller/templates/service-monitor.yaml
@@ -4,11 +4,8 @@ metadata:
   name: unpoller
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: unpoller
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: metrics
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   selector:
     matchLabels:
diff --git a/clusters/cl01tl/monitoring/unpoller/values.yaml b/clusters/cl01tl/monitoring/unpoller/values.yaml
index 9f5198276..61dfcbf1c 100644
--- a/clusters/cl01tl/monitoring/unpoller/values.yaml
+++ b/clusters/cl01tl/monitoring/unpoller/values.yaml
@@ -45,8 +45,6 @@ unpoller:
             requests:
               cpu: 10m
               memory: 64Mi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main