diff --git a/kubenix-modules/all.nix b/kubenix-modules/all.nix
index 9e48ea8..def89f1 100644
--- a/kubenix-modules/all.nix
+++ b/kubenix-modules/all.nix
@@ -33,5 +33,6 @@ in
     ./custom/nfs-volume.nix
     ./custom/longhorn-volume.nix
     ./traefik.nix
+    ./volumes.nix
   ] ++ applications;
 }
diff --git a/kubenix-modules/atticd.nix b/kubenix-modules/atticd.nix
index 6d0dada..2f7a320 100644
--- a/kubenix-modules/atticd.nix
+++ b/kubenix-modules/atticd.nix
@@ -100,7 +100,5 @@
         portName = "web";
       };
     };
-
-    nfsVolumes.atticd.path = "atticd";
   };
 }
diff --git a/kubenix-modules/forgejo/default.nix b/kubenix-modules/forgejo/default.nix
index 8357bdc..38105f6 100644
--- a/kubenix-modules/forgejo/default.nix
+++ b/kubenix-modules/forgejo/default.nix
@@ -226,12 +226,6 @@
   };
 
   lab = {
-    nfsVolumes = {
-      forgejo.path = "forgejo/data";
-      forgejo-runner-data.path = "forgejo/runner/data";
-      forgejo-runner-certs.path = "forgejo/runner/certs";
-    };
-
     ingresses.forgejo = {
       host = "git.kun.is";
 
diff --git a/kubenix-modules/freshrss.nix b/kubenix-modules/freshrss.nix
index 9d36ffd..e30d99e 100644
--- a/kubenix-modules/freshrss.nix
+++ b/kubenix-modules/freshrss.nix
@@ -65,8 +65,6 @@
   };
 
   lab = {
-    longhornVolumes.freshrss.storage = "400Mi";
-
     ingresses.freshrss = {
       host = "rss.kun.is";
       entrypoint = "localsecure";
diff --git a/kubenix-modules/hedgedoc.nix b/kubenix-modules/hedgedoc.nix
index 0379011..9fc8b2e 100644
--- a/kubenix-modules/hedgedoc.nix
+++ b/kubenix-modules/hedgedoc.nix
@@ -86,8 +86,6 @@
   };
 
   lab = {
-    longhornVolumes.hedgedoc-uploads.storage = "50Mi";
-
     ingresses.hedgedoc = {
       host = "md.kun.is";
 
diff --git a/kubenix-modules/kitchenowl.nix b/kubenix-modules/kitchenowl.nix
index ffa3ae0..ff2ef57 100644
--- a/kubenix-modules/kitchenowl.nix
+++ b/kubenix-modules/kitchenowl.nix
@@ -47,8 +47,6 @@
   };
 
   lab = {
-    nfsVolumes.kitchenowl.path = "kitchenowl/data";
-
     ingresses.kitchenowl = {
       host = "boodschappen.kun.is";
 
diff --git a/kubenix-modules/media.nix b/kubenix-modules/media.nix
index 8892b77..21b5bc1 100644
--- a/kubenix-modules/media.nix
+++ b/kubenix-modules/media.nix
@@ -514,17 +514,5 @@
         };
       };
     };
-
-    nfsVolumes = {
-      jellyfin-config.path = "jellyfin/config";
-      media.path = "media";
-      music.path = "media/music";
-      transmission-config.path = "transmission/config";
-      jellyseerr-config.path = "jellyseerr/config";
-      radarr-config.path = "radarr/config";
-      prowlarr-config.path = "prowlarr/config";
-      sonarr-config.path = "sonarr/config";
-      bazarr-config.path = "bazarr/config";
-    };
   };
 }
diff --git a/kubenix-modules/minecraft.nix b/kubenix-modules/minecraft.nix
index bd7f4a4..4ce6940 100644
--- a/kubenix-modules/minecraft.nix
+++ b/kubenix-modules/minecraft.nix
@@ -40,6 +40,4 @@
       };
     };
   };
-
-  lab.nfsVolumes.minecraft.path = "minecraft";
 }
diff --git a/kubenix-modules/nextcloud.nix b/kubenix-modules/nextcloud.nix
index 3ef72d1..f0049ce 100644
--- a/kubenix-modules/nextcloud.nix
+++ b/kubenix-modules/nextcloud.nix
@@ -51,8 +51,6 @@
   };
 
   lab = {
-    nfsVolumes.nextcloud.path = "nextcloud/data";
-
     ingresses.nextcloud = {
       host = "cloud.kun.is";
 
diff --git a/kubenix-modules/paperless-ngx.nix b/kubenix-modules/paperless-ngx.nix
index 393e7f2..7f13fd0 100644
--- a/kubenix-modules/paperless-ngx.nix
+++ b/kubenix-modules/paperless-ngx.nix
@@ -141,10 +141,5 @@
         portName = "web";
       };
     };
-
-    nfsVolumes = {
-      paperless-ngx-redisdata.path = "paperless-ngx/redisdata";
-      paperless-ngx-data.path = "paperless-ngx/data";
-    };
   };
 }
diff --git a/kubenix-modules/pihole.nix b/kubenix-modules/pihole.nix
index 2f190cb..5ced1f0 100644
--- a/kubenix-modules/pihole.nix
+++ b/kubenix-modules/pihole.nix
@@ -90,10 +90,5 @@
         portName = "web";
       };
     };
-
-    nfsVolumes = {
-      pihole-data.path = "pihole/data";
-      pihole-dnsmasq.path = "pihole/dnsmasq";
-    };
   };
 }
diff --git a/kubenix-modules/radicale.nix b/kubenix-modules/radicale.nix
index b4d542c..15148e0 100644
--- a/kubenix-modules/radicale.nix
+++ b/kubenix-modules/radicale.nix
@@ -85,8 +85,6 @@
   };
 
   lab = {
-    nfsVolumes.radicale.path = "radicale";
-
     ingresses.radicale = {
       host = "dav.kun.is";
 
diff --git a/kubenix-modules/syncthing.nix b/kubenix-modules/syncthing.nix
index 8b0332b..3474461 100644
--- a/kubenix-modules/syncthing.nix
+++ b/kubenix-modules/syncthing.nix
@@ -58,8 +58,6 @@
   };
 
   lab = {
-    nfsVolumes.syncthing.path = "syncthing/config";
-
     ingresses.syncthing = {
       host = "sync.kun.is";
       entrypoint = "localsecure";
diff --git a/kubenix-modules/volumes.nix b/kubenix-modules/volumes.nix
new file mode 100644
index 0000000..b95de25
--- /dev/null
+++ b/kubenix-modules/volumes.nix
@@ -0,0 +1,33 @@
+{
+  lab = {
+    longhornVolumes = {
+      hedgedoc-uploads.storage = "50Mi";
+      freshrss.storage = "400Mi";
+    };
+
+    nfsVolumes = {
+      jellyfin-config.path = "jellyfin/config";
+      media.path = "media";
+      music.path = "media/music";
+      transmission-config.path = "transmission/config";
+      jellyseerr-config.path = "jellyseerr/config";
+      radarr-config.path = "radarr/config";
+      prowlarr-config.path = "prowlarr/config";
+      sonarr-config.path = "sonarr/config";
+      bazarr-config.path = "bazarr/config";
+      atticd.path = "atticd";
+      radicale.path = "radicale";
+      syncthing.path = "syncthing/config";
+      kitchenowl.path = "kitchenowl/data";
+      pihole-data.path = "pihole/data";
+      pihole-dnsmasq.path = "pihole/dnsmasq";
+      paperless-ngx-redisdata.path = "paperless-ngx/redisdata";
+      paperless-ngx-data.path = "paperless-ngx/data";
+      nextcloud.path = "nextcloud/data";
+      minecraft.path = "minecraft";
+      forgejo.path = "forgejo/data";
+      forgejo-runner-data.path = "forgejo/runner/data";
+      forgejo-runner-certs.path = "forgejo/runner/certs";
+    };
+  };
+}