diff --git a/clusters/cl01tl/standalone/cilium/templates/cilium-l2-announcement-policy.yaml b/clusters/cl01tl/standalone/cilium/templates/cilium-l2-announcement-policy.yaml
index c6a04fd6a..744b2090e 100644
--- a/clusters/cl01tl/standalone/cilium/templates/cilium-l2-announcement-policy.yaml
+++ b/clusters/cl01tl/standalone/cilium/templates/cilium-l2-announcement-policy.yaml
@@ -4,11 +4,8 @@ metadata:
   name: default-l2-announcement-policy
   namespace: cilium
   labels:
-    app.kubernetes.io/name: default-l2-announcement-policy
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: network
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   interfaces:
     - enp6s0
diff --git a/clusters/cl01tl/standalone/cilium/templates/cilium-load-balancer-ip-pool.yaml b/clusters/cl01tl/standalone/cilium/templates/cilium-load-balancer-ip-pool.yaml
index 869d25eba..d742e81fe 100644
--- a/clusters/cl01tl/standalone/cilium/templates/cilium-load-balancer-ip-pool.yaml
+++ b/clusters/cl01tl/standalone/cilium/templates/cilium-load-balancer-ip-pool.yaml
@@ -4,11 +4,8 @@ metadata:
   name: default-ip-pool
   namespace: cilium
   labels:
-    app.kubernetes.io/name: default-ip-pool
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: network
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   blocks:
     - start: "10.232.1.21"
diff --git a/clusters/cl01tl/standalone/cilium/templates/http-route.yaml b/clusters/cl01tl/standalone/cilium/templates/http-route.yaml
index cba3a1516..e61a1059b 100644
--- a/clusters/cl01tl/standalone/cilium/templates/http-route.yaml
+++ b/clusters/cl01tl/standalone/cilium/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-hubble
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-hubble
+    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/standalone/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml b/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml
index 816381ac0..d3913f7c0 100644
--- a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml
+++ b/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml
@@ -4,16 +4,13 @@ metadata:
   name: kubelet-serving-cert-approver
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: kubelet-serving-cert-approver
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: server
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: "certificates:{{ .Release.Name }}"
 subjects:
   - kind: ServiceAccount
-    name: {{ .Release.Name }}
+    name: kubelet-serving-cert-approver
     namespace: {{ .Release.Namespace }}
diff --git a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/cluster-role.yaml b/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/cluster-role.yaml
index 45165caf7..f90043409 100644
--- a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/cluster-role.yaml
+++ b/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/cluster-role.yaml
@@ -4,11 +4,8 @@ metadata:
   name: "certificates:{{ .Release.Name }}"
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: kubelet-serving-cert-approver
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: server
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 rules:
   - apiGroups:
       - certificates.k8s.io
@@ -46,11 +43,8 @@ metadata:
   name: "events:{{ .Release.Name }}"
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: kubelet-serving-cert-approver
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: server
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 rules:
   - apiGroups:
       - ""
diff --git a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/namespace.yaml b/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/namespace.yaml
index 18e109be5..cd98253ac 100644
--- a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/namespace.yaml
+++ b/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/namespace.yaml
@@ -3,7 +3,7 @@ kind: Namespace
 metadata:
   name: kubelet-serving-cert-approver
   labels:
-    app.kubernetes.io/name: kubelet-serving-cert-approver
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     pod-security.kubernetes.io/audit: restricted
     pod-security.kubernetes.io/enforce: restricted
diff --git a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/role-binding.yaml b/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/role-binding.yaml
index 94da5493f..33405fc62 100644
--- a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/role-binding.yaml
+++ b/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/role-binding.yaml
@@ -4,11 +4,8 @@ metadata:
   name: "events:{{ .Release.Name }}"
   namespace: default
   labels:
-    app.kubernetes.io/name: kubelet-serving-cert-approver
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: server
-    app.kubernetes.io/part-of: kubelet-serving-cert-approver
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/values.yaml b/clusters/cl01tl/standalone/kubelet-serving-cert-approver/values.yaml
index e2e835955..b342f8b49 100644
--- a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/values.yaml
+++ b/clusters/cl01tl/standalone/kubelet-serving-cert-approver/values.yaml
@@ -56,7 +56,9 @@ kubelet-serving-cert-approver:
             readOnlyRootFilesystem: true
             runAsNonRoot: true
   serviceAccount:
-    create: true
+    kubelet-serving-cert-approver:
+      enabled: true
+      staticToken: true
   service:
     main:
       controller: main