diff --git a/clusters/cl01tl/helm/kubernetes-cloudflare-ddns/Chart.yaml b/clusters/cl01tl/helm/kubernetes-cloudflare-ddns/Chart.yaml
index 78e868ae6..0ec32a26c 100644
--- a/clusters/cl01tl/helm/kubernetes-cloudflare-ddns/Chart.yaml
+++ b/clusters/cl01tl/helm/kubernetes-cloudflare-ddns/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
   - kubernetes-cloudflare-ddns
   - ddns
   - job
-home: https://docs.alexlebens.dev/applications/kubelet-serving-cert-approver/
+home: https://docs.alexlebens.dev/applications/kubernetes-cloudflare-ddns/
 sources:
   - https://github.com/kubitodev/kubernetes-cloudflare-ddns
   - https://hub.docker.com/r/kubitodev/kubernetes-cloudflare-ddns
diff --git a/clusters/cl01tl/helm/kubernetes-cloudflare-ddns/templates/external-secret.yaml b/clusters/cl01tl/helm/kubernetes-cloudflare-ddns/templates/external-secret.yaml
index 593ce0c81..eba9ea0cf 100644
--- a/clusters/cl01tl/helm/kubernetes-cloudflare-ddns/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/kubernetes-cloudflare-ddns/templates/external-secret.yaml
@@ -9,7 +9,7 @@ metadata:
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
-    name: vault
+    name: openbao
   data:
     - secretKey: AUTH_KEY
       remoteRef:
diff --git a/clusters/cl01tl/helm/libation/Chart.yaml b/clusters/cl01tl/helm/libation/Chart.yaml
index 2fe121b93..796ed3770 100644
--- a/clusters/cl01tl/helm/libation/Chart.yaml
+++ b/clusters/cl01tl/helm/libation/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
   - libation
   - audible
   - job
-home: https://docs.alexlebens.dev/applications/languagetool/
+home: https://docs.alexlebens.dev/applications/libation/
 sources:
   - https://github.com/rmcrackan/Libation
   - https://hub.docker.com/r/rmcrackan/libation
diff --git a/clusters/cl01tl/helm/libation/templates/_helpers.tpl b/clusters/cl01tl/helm/libation/templates/_helpers.tpl
index 10688fcef..1567c77c9 100644
--- a/clusters/cl01tl/helm/libation/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/libation/templates/_helpers.tpl
@@ -12,3 +12,10 @@ Selector labels
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
+
+{{/*
+NFS names
+*/}}
+{{- define "custom.storageNfsName" -}}
+libation-nfs-storage
+{{- end -}}
diff --git a/clusters/cl01tl/helm/libation/templates/persistent-volume-claim.yaml b/clusters/cl01tl/helm/libation/templates/persistent-volume-claim.yaml
index 21a9df98f..7652a28b7 100644
--- a/clusters/cl01tl/helm/libation/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/libation/templates/persistent-volume-claim.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: libation-nfs-storage
+  name: {{ include "custom.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: libation-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
     {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: libation-nfs-storage
+  volumeName: {{ include "custom.storageNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
diff --git a/clusters/cl01tl/helm/libation/templates/persistent-volume.yaml b/clusters/cl01tl/helm/libation/templates/persistent-volume.yaml
index 495de2253..7fb8b215d 100644
--- a/clusters/cl01tl/helm/libation/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/libation/templates/persistent-volume.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: libation-nfs-storage
+  name: {{ include "custom.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: libation-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
     {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
diff --git a/clusters/cl01tl/helm/lidarr/templates/_helpers.tpl b/clusters/cl01tl/helm/lidarr/templates/_helpers.tpl
index 10688fcef..e12a5d3a3 100644
--- a/clusters/cl01tl/helm/lidarr/templates/_helpers.tpl
+++ b/clusters/cl01tl/helm/lidarr/templates/_helpers.tpl
@@ -12,3 +12,10 @@ Selector labels
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
+
+{{/*
+NFS names
+*/}}
+{{- define "custom.storageNfsName" -}}
+lidarr-nfs-storage
+{{- end -}}
diff --git a/clusters/cl01tl/helm/lidarr/templates/persistent-volume-claim.yaml b/clusters/cl01tl/helm/lidarr/templates/persistent-volume-claim.yaml
index 1c0617c89..7652a28b7 100644
--- a/clusters/cl01tl/helm/lidarr/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/helm/lidarr/templates/persistent-volume-claim.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: lidarr-nfs-storage
+  name: {{ include "custom.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: lidarr-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
     {{- include "custom.labels" . | nindent 4 }}
 spec:
-  volumeName: lidarr-nfs-storage
+  volumeName: {{ include "custom.storageNfsName" . }}
   storageClassName: nfs-client
   accessModes:
     - ReadWriteMany
diff --git a/clusters/cl01tl/helm/lidarr/templates/persistent-volume.yaml b/clusters/cl01tl/helm/lidarr/templates/persistent-volume.yaml
index d1fe2a868..7ce8d62aa 100644
--- a/clusters/cl01tl/helm/lidarr/templates/persistent-volume.yaml
+++ b/clusters/cl01tl/helm/lidarr/templates/persistent-volume.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: lidarr-nfs-storage
+  name: {{ include "custom.storageNfsName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: lidarr-nfs-storage
+    app.kubernetes.io/name: {{ include "custom.storageNfsName" . }}
     {{- include "custom.labels" . | nindent 4 }}
 spec:
   persistentVolumeReclaimPolicy: Retain
diff --git a/clusters/cl01tl/helm/local-path-provisioner/templates/namespace.yaml b/clusters/cl01tl/helm/local-path-provisioner/templates/namespace.yaml
index 6587103c2..bbbe36926 100644
--- a/clusters/cl01tl/helm/local-path-provisioner/templates/namespace.yaml
+++ b/clusters/cl01tl/helm/local-path-provisioner/templates/namespace.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: local-path-provisioner
+  name: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: local-path-provisioner
+    app.kubernetes.io/name: {{ .Release.Namespace }}
     {{- include "custom.labels" . | nindent 4 }}
     pod-security.kubernetes.io/audit: privileged
     pod-security.kubernetes.io/enforce: privileged
diff --git a/clusters/cl01tl/helm/loki/templates/namespace.yaml b/clusters/cl01tl/helm/loki/templates/namespace.yaml
index 793925bd9..bbbe36926 100644
--- a/clusters/cl01tl/helm/loki/templates/namespace.yaml
+++ b/clusters/cl01tl/helm/loki/templates/namespace.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: loki
+  name: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: loki
+    app.kubernetes.io/name: {{ .Release.Namespace }}
     {{- include "custom.labels" . | nindent 4 }}
     pod-security.kubernetes.io/audit: privileged
     pod-security.kubernetes.io/enforce: privileged