diff --git a/kubernetes/apps/default/babybuddy/app/helmrelease.yaml b/kubernetes/apps/default/babybuddy/app/helmrelease.yaml
index be0678965..1515c8dcb 100644
--- a/kubernetes/apps/default/babybuddy/app/helmrelease.yaml
+++ b/kubernetes/apps/default/babybuddy/app/helmrelease.yaml
@@ -75,14 +75,14 @@ spec:
               requests:
                 cpu: 100m
                 memory: 256Mi
-        # statefulset:
-        #   volumeClaimTemplates:
-        #     - name: config
-        #       accessMode: ReadWriteOnce
-        #       size: 1Gi
-        #       storageClass: rook-ceph-block
-        #       globalMounts:
-        #         - path: /config
+        statefulset:
+          volumeClaimTemplates:
+            - name: config
+              accessMode: ReadWriteOnce
+              size: 1Gi
+              storageClass: rook-ceph-block
+              globalMounts:
+                - path: /config
     service:
       main:
         ports:
diff --git a/kubernetes/apps/default/vaultwarden/app/helmrelease.yaml b/kubernetes/apps/default/vaultwarden/app/helmrelease.yaml
index c9ece1daf..801345e12 100644
--- a/kubernetes/apps/default/vaultwarden/app/helmrelease.yaml
+++ b/kubernetes/apps/default/vaultwarden/app/helmrelease.yaml
@@ -67,14 +67,14 @@ spec:
                 memory: 100Mi
               limits:
                 memory: 2Gi
-        # statefulset:
-        #   volumeClaimTemplates:
-        #     - name: config
-        #       accessMode: ReadWriteOnce
-        #       size: 10Gi
-        #       storageClass: rook-ceph-block
-        #       globalMounts:
-        #         - path: /data
+        statefulset:
+          volumeClaimTemplates:
+            - name: config
+              accessMode: ReadWriteOnce
+              size: 10Gi
+              storageClass: rook-ceph-block
+              globalMounts:
+                - path: /data
     service:
       main:
         ports:
diff --git a/kubernetes/apps/default/vikunja/app/kustomization.yaml b/kubernetes/apps/default/vikunja/app/kustomization.yaml
index e4ff3520b..d6a77b60b 100644
--- a/kubernetes/apps/default/vikunja/app/kustomization.yaml
+++ b/kubernetes/apps/default/vikunja/app/kustomization.yaml
@@ -8,7 +8,6 @@ resources:
   - ./gatus.yaml
   - ./helmrelease.yaml
   - ./volsync.yaml
-  - ./volume.yaml
 configMapGenerator:
   - name: vikunja-configmap
     files:
diff --git a/kubernetes/apps/default/vikunja/app/volume.yaml b/kubernetes/apps/default/vikunja/app/volume.yaml
deleted file mode 100644
index be1c70fd0..000000000
--- a/kubernetes/apps/default/vikunja/app/volume.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: vikunja-files
-  namespace: default
-  labels:
-    app.kubernetes.io/name: &name vikunja
-    app.kubernetes.io/instance: *name
-    snapshot.home.arpa/enabled: "true"
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: rook-ceph-block
-  resources:
-    requests:
-      storage: 1Gi
diff --git a/kubernetes/apps/default/zigbee2mqtt/app/kustomization.yaml b/kubernetes/apps/default/zigbee2mqtt/app/kustomization.yaml
index 7f3164b4e..da52dc6a0 100644
--- a/kubernetes/apps/default/zigbee2mqtt/app/kustomization.yaml
+++ b/kubernetes/apps/default/zigbee2mqtt/app/kustomization.yaml
@@ -6,4 +6,3 @@ resources:
 - ./gatus.yaml
 - ./helmrelease.yaml
 - ./volsync.yaml
-- ./volume.yaml
diff --git a/kubernetes/apps/default/zigbee2mqtt/app/volume.yaml b/kubernetes/apps/default/zigbee2mqtt/app/volume.yaml
deleted file mode 100644
index 83181f253..000000000
--- a/kubernetes/apps/default/zigbee2mqtt/app/volume.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: zigbee2mqtt-config
-  namespace: default
-  labels:
-    app.kubernetes.io/name: &name zigbee2mqtt
-    app.kubernetes.io/instance: *name
-    snapshot.home.arpa/enabled: "true"
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: rook-ceph-block
-  resources:
-    requests:
-      storage: 1Gi
diff --git a/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml b/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml
index a96b5a831..2267df6bc 100644
--- a/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml
+++ b/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml
@@ -61,7 +61,7 @@ spec:
         nodes:
           - name: "talos-node-2"
             devices:
-              - name: "nvme0n1"
+              - name: "sda"
           - name: "talos-node-3"
             devices:
               - name: "sda"
diff --git a/kubernetes/apps/rook-ceph/rook-ceph/ks.yaml b/kubernetes/apps/rook-ceph/rook-ceph/ks.yaml
index adc197323..06b281162 100644
--- a/kubernetes/apps/rook-ceph/rook-ceph/ks.yaml
+++ b/kubernetes/apps/rook-ceph/rook-ceph/ks.yaml
@@ -37,12 +37,12 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-rook-ceph-toolbox
+  name: cluster-apps-rook-ceph-tools
   namespace: flux-system
 spec:
   dependsOn:
     - name: cluster-apps-rook-ceph-cluster
-  path: ./kubernetes/apps/rook-ceph/rook-ceph/toolbox
+  path: ./kubernetes/apps/rook-ceph/rook-ceph/tools
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/apps/rook-ceph/rook-ceph/toolbox/helmrelease.yaml b/kubernetes/apps/rook-ceph/rook-ceph/tools/helmrelease.yaml
similarity index 97%
rename from kubernetes/apps/rook-ceph/rook-ceph/toolbox/helmrelease.yaml
rename to kubernetes/apps/rook-ceph/rook-ceph/tools/helmrelease.yaml
index 9b3d779ae..43f7492fa 100644
--- a/kubernetes/apps/rook-ceph/rook-ceph/toolbox/helmrelease.yaml
+++ b/kubernetes/apps/rook-ceph/rook-ceph/tools/helmrelease.yaml
@@ -3,7 +3,7 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
-  name: &app rook-ceph-toolbox
+  name: &app rook-ceph-tools
   namespace: rook-ceph
 spec:
   interval: 30m
@@ -28,6 +28,8 @@ spec:
     keepHistory: false
   values:
     defaultPodOptions:
+      labels:
+        app: *app
       hostNetwork: true
       securityContext:
         runAsUser: 0
diff --git a/kubernetes/apps/rook-ceph/rook-ceph/toolbox/kustomization.yaml b/kubernetes/apps/rook-ceph/rook-ceph/tools/kustomization.yaml
similarity index 100%
rename from kubernetes/apps/rook-ceph/rook-ceph/toolbox/kustomization.yaml
rename to kubernetes/apps/rook-ceph/rook-ceph/tools/kustomization.yaml