diff --git a/clusters/cl01tl/services/blocky/Chart.yaml b/clusters/cl01tl/services/blocky/Chart.yaml
index 0461a6d47..bcaeb235d 100644
--- a/clusters/cl01tl/services/blocky/Chart.yaml
+++ b/clusters/cl01tl/services/blocky/Chart.yaml
@@ -18,7 +18,7 @@ dependencies:
   - name: app-template
     alias: blocky
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 3.7.3
+    version: 4.0.1
   - name: valkey
     version: 3.0.6
     repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
diff --git a/clusters/cl01tl/services/blocky/templates/service-monitor.yaml b/clusters/cl01tl/services/blocky/templates/service-monitor.yaml
index 005a59260..8aa5efd86 100644
--- a/clusters/cl01tl/services/blocky/templates/service-monitor.yaml
+++ b/clusters/cl01tl/services/blocky/templates/service-monitor.yaml
@@ -4,11 +4,8 @@ metadata:
   name: blocky
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: blocky
+    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/services/blocky/values.yaml b/clusters/cl01tl/services/blocky/values.yaml
index 55dd54c7b..30350c060 100644
--- a/clusters/cl01tl/services/blocky/values.yaml
+++ b/clusters/cl01tl/services/blocky/values.yaml
@@ -18,8 +18,6 @@ blocky:
             requests:
               cpu: 10m
               memory: 128Mi
-  serviceAccount:
-    create: true
   configMaps:
     config:
       enabled: true
diff --git a/clusters/cl01tl/services/cert-manager/templates/external-secret.yaml b/clusters/cl01tl/services/cert-manager/templates/external-secret.yaml
index 20a5d5e59..ae5beccca 100644
--- a/clusters/cl01tl/services/cert-manager/templates/external-secret.yaml
+++ b/clusters/cl01tl/services/cert-manager/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: cloudflare-api-token
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: cloudflare-api-token
+    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/services/external-dns/templates/dns-endpoint.yaml b/clusters/cl01tl/services/external-dns/templates/dns-endpoint.yaml
index fceae03f4..929954b95 100644
--- a/clusters/cl01tl/services/external-dns/templates/dns-endpoint.yaml
+++ b/clusters/cl01tl/services/external-dns/templates/dns-endpoint.yaml
@@ -4,11 +4,8 @@ metadata:
   name: external-device-names
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: external-device-names
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: networking
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   endpoints:
     # Unifi UDM
@@ -49,11 +46,8 @@ metadata:
   name: iot-device-names
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: iot-device-names
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: networking
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   endpoints:
     # Airgradient
@@ -88,11 +82,8 @@ metadata:
   name: server-host-names
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: server-host-names
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: networking
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   endpoints:
     # Unifi Gateway
@@ -133,11 +124,8 @@ metadata:
   name: cluster-service-names
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: cluster-service-names
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: networking
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   endpoints:
     # Treafik Proxy
diff --git a/clusters/cl01tl/services/external-dns/templates/external-secret.yaml b/clusters/cl01tl/services/external-dns/templates/external-secret.yaml
index 166e7cabb..210b9ac61 100644
--- a/clusters/cl01tl/services/external-dns/templates/external-secret.yaml
+++ b/clusters/cl01tl/services/external-dns/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: external-dns-unifi-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: external-dns-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/services/kubernetes-cloudflare-ddns/templates/external-secret.yaml b/clusters/cl01tl/services/kubernetes-cloudflare-ddns/templates/external-secret.yaml
index cf393d04a..779629b15 100644
--- a/clusters/cl01tl/services/kubernetes-cloudflare-ddns/templates/external-secret.yaml
+++ b/clusters/cl01tl/services/kubernetes-cloudflare-ddns/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: kubernetes-cloudflare-ddns-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: kubernetes-cloudflare-ddns-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/services/kubernetes-cloudflare-ddns/values.yaml b/clusters/cl01tl/services/kubernetes-cloudflare-ddns/values.yaml
index 818ea2b50..9486411c8 100644
--- a/clusters/cl01tl/services/kubernetes-cloudflare-ddns/values.yaml
+++ b/clusters/cl01tl/services/kubernetes-cloudflare-ddns/values.yaml
@@ -25,5 +25,3 @@ kubernetes-cloudflare-ddns:
             requests:
               cpu: 10m
               memory: 128Mi
-  serviceAccount:
-    create: true