diff --git a/kubernetes/apps/default/homelab/truenas/backup/helmrelease.yaml b/.archive/kubernetes/homelab/truenas/backup/helmrelease.yaml
similarity index 100%
rename from kubernetes/apps/default/homelab/truenas/backup/helmrelease.yaml
rename to .archive/kubernetes/homelab/truenas/backup/helmrelease.yaml
diff --git a/kubernetes/apps/default/homelab/truenas/backup/kustomization.yaml b/.archive/kubernetes/homelab/truenas/backup/kustomization.yaml
similarity index 100%
rename from kubernetes/apps/default/homelab/truenas/backup/kustomization.yaml
rename to .archive/kubernetes/homelab/truenas/backup/kustomization.yaml
diff --git a/kubernetes/apps/default/homelab/truenas/backup/truenas-backup.sh b/.archive/kubernetes/homelab/truenas/backup/truenas-backup.sh
similarity index 100%
rename from kubernetes/apps/default/homelab/truenas/backup/truenas-backup.sh
rename to .archive/kubernetes/homelab/truenas/backup/truenas-backup.sh
diff --git a/kubernetes/apps/default/homelab/truenas/externalsecret.yaml b/.archive/kubernetes/homelab/truenas/externalsecret.yaml
similarity index 97%
rename from kubernetes/apps/default/homelab/truenas/externalsecret.yaml
rename to .archive/kubernetes/homelab/truenas/externalsecret.yaml
index b79a92fee..5862dfb43 100644
--- a/kubernetes/apps/default/homelab/truenas/externalsecret.yaml
+++ b/.archive/kubernetes/homelab/truenas/externalsecret.yaml
@@ -3,7 +3,7 @@
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
-  name: homelab-truenas
+  name: homelab-storage
   namespace: default
 spec:
   secretStoreRef:
diff --git a/kubernetes/apps/default/homelab/truenas/readme.md b/.archive/kubernetes/homelab/truenas/readme.md
similarity index 100%
rename from kubernetes/apps/default/homelab/truenas/readme.md
rename to .archive/kubernetes/homelab/truenas/readme.md
diff --git a/kubernetes/apps/default/homelab/ks.yaml b/kubernetes/apps/default/homelab/ks.yaml
index 629bbeeba..3eadde505 100644
--- a/kubernetes/apps/default/homelab/ks.yaml
+++ b/kubernetes/apps/default/homelab/ks.yaml
@@ -55,14 +55,14 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: &app homelab-truenas
+  name: &app homelab-storage
   namespace: flux-system
 spec:
   targetNamespace: default
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/default/homelab/truenas
+  path: ./kubernetes/apps/default/homelab/storage
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/apps/default/homelab/truenas/kustomization.yaml b/kubernetes/apps/default/homelab/storage/kustomization.yaml
similarity index 86%
rename from kubernetes/apps/default/homelab/truenas/kustomization.yaml
rename to kubernetes/apps/default/homelab/storage/kustomization.yaml
index 05b6d18ed..034a33f03 100644
--- a/kubernetes/apps/default/homelab/truenas/kustomization.yaml
+++ b/kubernetes/apps/default/homelab/storage/kustomization.yaml
@@ -4,6 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-  - ./backup
-  - ./externalsecret.yaml
   - ./photo-sort
diff --git a/kubernetes/apps/default/homelab/truenas/photo-sort/helmrelease.yaml b/kubernetes/apps/default/homelab/storage/photo-sort/helmrelease.yaml
similarity index 95%
rename from kubernetes/apps/default/homelab/truenas/photo-sort/helmrelease.yaml
rename to kubernetes/apps/default/homelab/storage/photo-sort/helmrelease.yaml
index ec25e2b2f..339139f5a 100644
--- a/kubernetes/apps/default/homelab/truenas/photo-sort/helmrelease.yaml
+++ b/kubernetes/apps/default/homelab/storage/photo-sort/helmrelease.yaml
@@ -29,7 +29,7 @@ spec:
     keepHistory: false
   values:
     controllers:
-      homelab-truenas-photo-sort:
+      homelab-storage-photo-sort:
         type: cronjob
         cronjob:
           concurrencyPolicy: Forbid
@@ -59,7 +59,7 @@ spec:
     persistence:
       scripts:
         type: configMap
-        name: homelab-truenas-photo-sort-configmap
+        name: homelab-storage-photo-sort-configmap
         defaultMode: 0775
         globalMounts:
           - path: /app/sort.sh
diff --git a/kubernetes/apps/default/homelab/truenas/photo-sort/kustomization.yaml b/kubernetes/apps/default/homelab/storage/photo-sort/kustomization.yaml
similarity index 90%
rename from kubernetes/apps/default/homelab/truenas/photo-sort/kustomization.yaml
rename to kubernetes/apps/default/homelab/storage/photo-sort/kustomization.yaml
index aefef17d4..69815076c 100644
--- a/kubernetes/apps/default/homelab/truenas/photo-sort/kustomization.yaml
+++ b/kubernetes/apps/default/homelab/storage/photo-sort/kustomization.yaml
@@ -6,7 +6,7 @@ namespace: default
 resources:
   - ./helmrelease.yaml
 configMapGenerator:
-  - name: homelab-truenas-photo-sort-configmap
+  - name: homelab-storage-photo-sort-configmap
     files:
       - ./scripts/sort.sh
 generatorOptions:
diff --git a/kubernetes/apps/default/homelab/truenas/photo-sort/scripts/sort.sh b/kubernetes/apps/default/homelab/storage/photo-sort/scripts/sort.sh
similarity index 100%
rename from kubernetes/apps/default/homelab/truenas/photo-sort/scripts/sort.sh
rename to kubernetes/apps/default/homelab/storage/photo-sort/scripts/sort.sh