diff --git a/clusters/cl01tl/services/harbor/templates/external-secret.yaml b/clusters/cl01tl/services/harbor/templates/external-secret.yaml
index 676d88a2a..ddbd65f02 100644
--- a/clusters/cl01tl/services/harbor/templates/external-secret.yaml
+++ b/clusters/cl01tl/services/harbor/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: harbor-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: harbor-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
@@ -71,11 +68,8 @@ metadata:
   name: harbor-postgresql-17-cluster-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: harbor-postgresql-17-cluster-backup-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: database
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/services/tailscale-operator/templates/connector.yaml b/clusters/cl01tl/services/tailscale-operator/templates/connector.yaml
index 0a51d611e..672462a51 100644
--- a/clusters/cl01tl/services/tailscale-operator/templates/connector.yaml
+++ b/clusters/cl01tl/services/tailscale-operator/templates/connector.yaml
@@ -4,11 +4,8 @@ metadata:
   name: subnet-router-local
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: subnet-router-local
+    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 }}
 spec:
   hostname: subnet-router-local-cl01tl
   proxyClass: default
diff --git a/clusters/cl01tl/services/tailscale-operator/templates/dns-config.yaml b/clusters/cl01tl/services/tailscale-operator/templates/dns-config.yaml
index 612c424a0..cc865c3ee 100644
--- a/clusters/cl01tl/services/tailscale-operator/templates/dns-config.yaml
+++ b/clusters/cl01tl/services/tailscale-operator/templates/dns-config.yaml
@@ -4,11 +4,8 @@ metadata:
   name: ts-dns
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: ts-dns
+    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 }}
 spec:
   nameserver:
     image:
diff --git a/clusters/cl01tl/services/tailscale-operator/templates/external-secrets.yaml b/clusters/cl01tl/services/tailscale-operator/templates/external-secrets.yaml
index 7adf0162e..febf83907 100644
--- a/clusters/cl01tl/services/tailscale-operator/templates/external-secrets.yaml
+++ b/clusters/cl01tl/services/tailscale-operator/templates/external-secrets.yaml
@@ -4,11 +4,8 @@ metadata:
   name: operator-oauth
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: operator-oauth
+    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/tailscale-operator/templates/proxy-class.yaml b/clusters/cl01tl/services/tailscale-operator/templates/proxy-class.yaml
index 60435ae42..eade5f958 100644
--- a/clusters/cl01tl/services/tailscale-operator/templates/proxy-class.yaml
+++ b/clusters/cl01tl/services/tailscale-operator/templates/proxy-class.yaml
@@ -4,11 +4,8 @@ metadata:
   name: default
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: default
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: proxy
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   metrics:
     enable: true
@@ -32,11 +29,8 @@ metadata:
   name: no-metrics
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: no-metrics
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: proxy
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   metrics:
     enable: false
diff --git a/clusters/cl01tl/services/talos/templates/external-secret.yaml b/clusters/cl01tl/services/talos/templates/external-secret.yaml
index b6c1354d5..110939d71 100644
--- a/clusters/cl01tl/services/talos/templates/external-secret.yaml
+++ b/clusters/cl01tl/services/talos/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: talos-etcd-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: talos-etcd-backup-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: storage
-    app.kubernetes.io/part-of: {{ .Release.Name }}
   annotations:
     kubernetes.io/service-account.name: talos-backup-secrets
 spec:
diff --git a/clusters/cl01tl/services/talos/templates/secret.yaml b/clusters/cl01tl/services/talos/templates/secret.yaml
index 7b9460b54..c1d456595 100644
--- a/clusters/cl01tl/services/talos/templates/secret.yaml
+++ b/clusters/cl01tl/services/talos/templates/secret.yaml
@@ -4,10 +4,7 @@ metadata:
   name: talos-backup-secrets
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: talos-backup-secrets
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: storage
-    app.kubernetes.io/part-of: {{ .Release.Name }}
   annotations:
     kubernetes.io/service-account.name: talos-backup-secrets
diff --git a/clusters/cl01tl/services/talos/templates/service-account.yaml b/clusters/cl01tl/services/talos/templates/service-account.yaml
index 03acfa505..e0d8ab67d 100644
--- a/clusters/cl01tl/services/talos/templates/service-account.yaml
+++ b/clusters/cl01tl/services/talos/templates/service-account.yaml
@@ -4,11 +4,8 @@ metadata:
   name: talos-backup-secrets
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: talos-backup-secrets
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: storage
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   roles:
     - os:etcd:backup