diff --git a/clusters/cl01tl/helm/argocd/templates/_helpers.tpl b/clusters/cl01tl/helm/argocd/templates/_helpers.tpl
index 251852577..10688fcef 100644
--- a/clusters/cl01tl/helm/argocd/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/argocd/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "argocd.labels" -}}
-{{ include "argocd.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "argocd.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
diff --git a/clusters/cl01tl/helm/argocd/templates/external-secret.yaml b/clusters/cl01tl/helm/argocd/templates/external-secret.yaml
index 8626fb963..1bd10429d 100644
--- a/clusters/cl01tl/helm/argocd/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/argocd/templates/external-secret.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: argocd-oidc-authentik
-    {{- include "argocd.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -28,7 +28,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: argocd-notifications-ntfy
-    {{- include "argocd.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/helm/audiobookshelf/templates/_helpers.tpl b/clusters/cl01tl/helm/audiobookshelf/templates/_helpers.tpl
index fafc16ec0..92b2157f0 100644
--- a/clusters/cl01tl/helm/audiobookshelf/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/audiobookshelf/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "audiobookshelf.labels" -}}
-{{ include "audiobookshelf.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "audiobookshelf.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
@@ -16,12 +16,12 @@ app.kubernetes.io/part-of: {{ .Release.Name }}
 {{/*
 NFS names
 */}}
-{{- define "audiobookshelf.booksNfsName" -}}
+{{- define "custom.booksNfsName" -}}
 audiobookshelf-books-nfs-storage
 {{- end -}}
-{{- define "audiobookshelf.audiobooksNfsName" -}}
+{{- define "custom.audiobooksNfsName" -}}
 audiobookshelf-audiobooks-nfs-storage
 {{- end -}}
-{{- define "audiobookshelf.podcastsNfsName" -}}
+{{- define "custom.podcastsNfsName" -}}
 audiobookshelf-podcasts-nfs-storage
 {{- end -}}
diff --git a/clusters/cl01tl/helm/audiobookshelf/templates/external-secret.yaml b/clusters/cl01tl/helm/audiobookshelf/templates/external-secret.yaml
index d82c2ad62..bcc08b1e8 100644
--- a/clusters/cl01tl/helm/audiobookshelf/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/audiobookshelf/templates/external-secret.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: audiobookshelf-config-apprise
-    {{- include "audiobookshelf.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml
index 2edf51afe..111faa423 100644
--- a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume-claim.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "audiobookshelf.booksNfsName" . }}
+  name: {{ include "custom.booksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ include "audiobookshelf.booksNfsName" . }}
-    {{ include "audiobookshelf.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.booksNfsName" . }}
+    {{ include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: {{ include "audiobookshelf.booksNfsName" . }}
+  volumeName: {{ include "custom.booksNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
@@ -19,13 +19,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "audiobookshelf.audiobooksNfsName" . }}
+  name: {{ include "custom.audiobooksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ include "audiobookshelf.audiobooksNfsName" . }}
-    {{- include "audiobookshelf.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.audiobooksNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: {{ include "audiobookshelf.audiobooksNfsName" . }}
+  volumeName: {{ include "custom.audiobooksNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
@@ -37,13 +37,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "audiobookshelf.podcastsNfsName" . }}
+  name: {{ include "custom.podcastsNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ include "audiobookshelf.podcastsNfsName" . }}
-    {{- include "audiobookshelf.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.podcastsNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: {{ include "audiobookshelf.podcastsNfsName" . }}
+  volumeName: {{ include "custom.podcastsNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
diff --git a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml
index f6f7338fe..b24d092c2 100644
--- a/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/audiobookshelf/templates/persistent-volume.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{ include "audiobookshelf.booksNfsName" . }}
+  name: {{ include "custom.booksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ include "audiobookshelf.booksNfsName" . }}
-    {{- include "audiobookshelf.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.booksNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
@@ -25,11 +25,11 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{ include "audiobookshelf.audiobooksNfsName" . }}
+  name: {{ include "custom.audiobooksNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ include "audiobookshelf.audiobooksNfsName" . }}
-    {{- include "audiobookshelf.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.audiobooksNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
@@ -49,11 +49,11 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{ include "audiobookshelf.podcastsNfsName" . }}
+  name: {{ include "custom.podcastsNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ include "audiobookshelf.podcastsNfsName" . }}
-    {{- include "audiobookshelf.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.podcastsNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/helm/authentik/templates/_helpers.tpl b/clusters/cl01tl/helm/authentik/templates/_helpers.tpl
index 523f2ccb7..10688fcef 100644
--- a/clusters/cl01tl/helm/authentik/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/authentik/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "authentik.labels" -}}
-{{ include "authentik.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "authentik.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
diff --git a/clusters/cl01tl/helm/authentik/templates/external-secret.yaml b/clusters/cl01tl/helm/authentik/templates/external-secret.yaml
index 7d2fa7041..fd6e59848 100644
--- a/clusters/cl01tl/helm/authentik/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/authentik/templates/external-secret.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: authentik-key
-    {{- include "authentik.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/helm/authentik/templates/ingress.yaml b/clusters/cl01tl/helm/authentik/templates/ingress.yaml
index b16db26c5..d03d9b19e 100644
--- a/clusters/cl01tl/helm/authentik/templates/ingress.yaml
+++ b/clusters/cl01tl/helm/authentik/templates/ingress.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}-tailscale
     tailscale.com/proxy-class: no-metrics
-    {{- include "authentik.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
   annotations:
     tailscale.com/experimental-forward-cluster-traffic-via-ingress: "true"
 spec:
diff --git a/clusters/cl01tl/helm/authentik/templates/reference-grant.yaml b/clusters/cl01tl/helm/authentik/templates/reference-grant.yaml
index b03d840fb..cd6a2e2b8 100644
--- a/clusters/cl01tl/helm/authentik/templates/reference-grant.yaml
+++ b/clusters/cl01tl/helm/authentik/templates/reference-grant.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: allow-outpost-cross-namespace-access
-    {{- include "authentik.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   from:
     - group: gateway.networking.k8s.io
diff --git a/clusters/cl01tl/helm/backrest/templates/_helpers.tpl b/clusters/cl01tl/helm/backrest/templates/_helpers.tpl
index 13cb540f8..5d6aba1a4 100644
--- a/clusters/cl01tl/helm/backrest/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/backrest/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "backrest.labels" -}}
-{{ include "backrest.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "backrest.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
@@ -16,9 +16,9 @@ app.kubernetes.io/part-of: {{ .Release.Name }}
 {{/*
 NFS names
 */}}
-{{- define "backrest.storageNfsName" -}}
+{{- define "custom.storageNfsName" -}}
 backrest-nfs-storage
 {{- end -}}
-{{- define "backrest.shareNfsName" -}}
+{{- define "custom.shareNfsName" -}}
 backrest-nfs-share
 {{- end -}}
diff --git a/clusters/cl01tl/helm/backrest/templates/persistent-volume-claim.yaml b/clusters/cl01tl/helm/backrest/templates/persistent-volume-claim.yaml
index 30ec73aa5..58ba6d02d 100644
--- a/clusters/cl01tl/helm/backrest/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/backrest/templates/persistent-volume-claim.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{- include "backrest.storageNfsName" . }}
+  name: {{ include "custom.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "backrest.storageNfsName" . }}
-    {{- include "backrest.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: {{- include "backrest.storageNfsName" . }}
+  volumeName: {{ include "custom.storageNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
@@ -19,13 +19,13 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{- include "backrest.shareNfsName" . }}
+  name: {{ include "custom.shareNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "backrest.shareNfsName" . }}
-    {{- include "backrest.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.shareNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: {{- include "backrest.shareNfsName" . }}
+  volumeName: {{ include "custom.shareNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
diff --git a/clusters/cl01tl/helm/backrest/templates/persistent-volume.yaml b/clusters/cl01tl/helm/backrest/templates/persistent-volume.yaml
index d1f889f7a..bd25c5e29 100644
--- a/clusters/cl01tl/helm/backrest/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/backrest/templates/persistent-volume.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{- include "backrest.storageNfsName" . }}
+  name: {{ include "custom.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "backrest.storageNfsName" . }}
-    {{- include "backrest.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
@@ -25,11 +25,11 @@ spec:
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{- include "backrest.shareNfsName" . }}
+  name: {{ include "custom.shareNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "backrest.shareNfsName" . }}
-    {{- include "backrest.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.shareNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/helm/bazarr/templates/_helpers.tpl b/clusters/cl01tl/helm/bazarr/templates/_helpers.tpl
index b86c452c0..9d2e95087 100644
--- a/clusters/cl01tl/helm/bazarr/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/bazarr/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "bazarr.labels" -}}
-{{ include "bazarr.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "bazarr.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
@@ -16,6 +16,6 @@ app.kubernetes.io/part-of: {{ .Release.Name }}
 {{/*
 NFS names
 */}}
-{{- define "bazarr.storageNfsName" -}}
+{{- define "custom.storageNfsName" -}}
 bazarr-nfs-storage
 {{- end -}}
diff --git a/clusters/cl01tl/helm/bazarr/templates/external-secret.yaml b/clusters/cl01tl/helm/bazarr/templates/external-secret.yaml
index b2421d884..6bb426c16 100644
--- a/clusters/cl01tl/helm/bazarr/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/bazarr/templates/external-secret.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: bazarr-key
-    {{- include "bazarr.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/helm/bazarr/templates/persistent-volume-claim.yaml b/clusters/cl01tl/helm/bazarr/templates/persistent-volume-claim.yaml
index a71736ef3..7652a28b7 100644
--- a/clusters/cl01tl/helm/bazarr/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/bazarr/templates/persistent-volume-claim.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{- include "bazarr.storageNfsName" . }}
+  name: {{ include "custom.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "bazarr.storageNfsName" . }}
-    {{- include "bazarr.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: {{ .Template.Name }}
+  volumeName: {{ include "custom.storageNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
diff --git a/clusters/cl01tl/helm/bazarr/templates/persistent-volume.yaml b/clusters/cl01tl/helm/bazarr/templates/persistent-volume.yaml
index 2021b4a6d..7ce8d62aa 100644
--- a/clusters/cl01tl/helm/bazarr/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/bazarr/templates/persistent-volume.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{- include "bazarr.storageNfsName" . }}
+  name: {{ include "custom.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "bazarr.storageNfsName" . }}
-    {{- include "bazarr.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: nfs-client
diff --git a/clusters/cl01tl/helm/cert-manager/templates/_helpers.tpl b/clusters/cl01tl/helm/cert-manager/templates/_helpers.tpl
index fd08bb911..df7fe04fc 100644
--- a/clusters/cl01tl/helm/cert-manager/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/cert-manager/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "cert-manager.labels" -}}
-{{ include "cert-manager.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "cert-manager.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
@@ -16,9 +16,9 @@ app.kubernetes.io/part-of: {{ .Release.Name }}
 {{/*
 NFS names
 */}}
-{{- define "cert-manager.cloudflareSecretName" -}}
+{{- define "custom.cloudflareSecretName" -}}
 cert-manager-cloudflare-api-token
 {{- end -}}
-{{- define "cert-manager.cloudflareSecretKey" -}}
+{{- define "custom.cloudflareSecretKey" -}}
 api-token
 {{- end -}}
diff --git a/clusters/cl01tl/helm/cert-manager/templates/cluster-issuer.yaml b/clusters/cl01tl/helm/cert-manager/templates/cluster-issuer.yaml
index 73587a621..3c1d38b6c 100644
--- a/clusters/cl01tl/helm/cert-manager/templates/cluster-issuer.yaml
+++ b/clusters/cl01tl/helm/cert-manager/templates/cluster-issuer.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: letsencrypt-issuer
-    {{- include "cert-manager.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   acme:
     email: alexanderlebens@gmail.com
@@ -21,5 +21,5 @@ spec:
           cloudflare:
             email: alexanderlebens@gmail.com
             apiTokenSecretRef:
-              name: {{- include "cert-manager.cloudflareSecretName" . }}
-              key: {{- include "cert-manager.cloudflareSecretKey" . }}
+              name: {{ include "custom.cloudflareSecretName" . }}
+              key: {{ include "custom.cloudflareSecretKey" . }}
diff --git a/clusters/cl01tl/helm/cert-manager/templates/external-secret.yaml b/clusters/cl01tl/helm/cert-manager/templates/external-secret.yaml
index ab52d7d52..4a25a5d2a 100644
--- a/clusters/cl01tl/helm/cert-manager/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/cert-manager/templates/external-secret.yaml
@@ -1,17 +1,17 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: {{- include "cert-manager.cloudflareSecretName" . }}
+  name: {{ include "custom.cloudflareSecretName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{- include "cert-manager.cloudflareSecretName" . }}
-    {{- include "cert-manager.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "custom.cloudflareSecretName" . }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
     name: openbao
   data:
-    - secretKey: {{- include "cert-manager.cloudflareSecretKey" . }}
+    - secretKey: {{ include "custom.cloudflareSecretKey" . }}
       remoteRef:
         key: /cloudflare/alexlebens.net/cl01tl-issuer-certificate
         property: token
diff --git a/clusters/cl01tl/helm/cilium/templates/_helpers.tpl b/clusters/cl01tl/helm/cilium/templates/_helpers.tpl
index 4a67642f9..10688fcef 100644
--- a/clusters/cl01tl/helm/cilium/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/cilium/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "cilium.labels" -}}
-{{ include "cilium.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "cilium.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
diff --git a/clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml b/clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml
index a3b8a2917..1576eb0b1 100644
--- a/clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml
+++ b/clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: default-ip-pool
-    {{- include "cilium.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   blocks:
     - start: "10.232.1.21"
@@ -19,7 +19,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: bgp-ip-pool
-    {{- include "cilium.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   blocks:
     - start: "10.232.2.100"
diff --git a/clusters/cl01tl/helm/cilium/templates/http-route.yaml b/clusters/cl01tl/helm/cilium/templates/http-route.yaml
index f2e951592..f631ec670 100644
--- a/clusters/cl01tl/helm/cilium/templates/http-route.yaml
+++ b/clusters/cl01tl/helm/cilium/templates/http-route.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: hubble
-    {{- include "cilium.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   parentRefs:
     - group: gateway.networking.k8s.io
diff --git a/clusters/cl01tl/helm/dawarich/templates/_helpers.tpl b/clusters/cl01tl/helm/dawarich/templates/_helpers.tpl
index fd1b5cc89..10688fcef 100644
--- a/clusters/cl01tl/helm/dawarich/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/dawarich/templates/_helpers.tpl
@@ -1,14 +1,14 @@
 {{/*
 Common labels
 */}}
-{{- define "dawarich.labels" -}}
-{{ include "dawarich.selectorLabels" $ }}
+{{- define "custom.labels" -}}
+{{ include "custom.selectorLabels" $ }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "dawarich.selectorLabels" -}}
+{{- define "custom.selectorLabels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
diff --git a/clusters/cl01tl/helm/dawarich/templates/external-secret.yaml b/clusters/cl01tl/helm/dawarich/templates/external-secret.yaml
index 924a8baa5..821516e39 100644
--- a/clusters/cl01tl/helm/dawarich/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/dawarich/templates/external-secret.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: dawarich-key
-    {{- include "dawarich.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -24,7 +24,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: dawarich-oidc-authentik
-    {{- include "dawarich.labels" . | nindent 4 }}
+    {{- include "custom.labels" . | nindent 4 }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore