diff --git a/hosts/envy/filesystems/default.nix b/hosts/envy/filesystems/default.nix
index 2223041..52090c1 100644
--- a/hosts/envy/filesystems/default.nix
+++ b/hosts/envy/filesystems/default.nix
@@ -15,7 +15,7 @@
 
     # Network mounts
     "/home/${config.sysusers.main}/KittyNFS" = {
-      device = "10.100.0.1:/export/KittyNFS";
+      device = "10.100.0.1:/storage";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
     };
diff --git a/hosts/iso/default.nix b/hosts/iso/default.nix
index 7f10975..4f4f504 100644
--- a/hosts/iso/default.nix
+++ b/hosts/iso/default.nix
@@ -1,21 +1,16 @@
 { lib, ... }:
 {
   imports = [
-    ./filesystems
     ./hardware
     ./users
     ../../modules/system
   ];
 
-  networking = {
-    hostName = "extern";
-    wg-quick.interfaces.wgc.address = [ "10.100.0.21/24" ];
-  };
+  networking.hostName = "iso";
 
   system = {
     desktop.enable = true;
     wireless.enable = true;
-    wireguard.client.enable = true;
     video.nvidia.enable = true;
     libvirtd.enable = true;
     stateVersion = "24.11";
diff --git a/hosts/iso/filesystems/default.nix b/hosts/iso/filesystems/default.nix
deleted file mode 100644
index 96d47e1..0000000
--- a/hosts/iso/filesystems/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, ... }:
-{
-  fileSystems = {
-    # Network mounts
-    "/home/${config.sysusers.main}/KittyNFS" = {
-      device = "10.100.0.1:/export/KittyNFS";
-      fsType = "nfs4";
-      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
-    };
-  };
-}
diff --git a/hosts/kitty/filesystems/default.nix b/hosts/kitty/filesystems/default.nix
index d5df64b..b3918e8 100644
--- a/hosts/kitty/filesystems/default.nix
+++ b/hosts/kitty/filesystems/default.nix
@@ -6,5 +6,4 @@
     neededForBoot = true;
     options = [ "subvol=persist" "compress=zstd" "noatime" ];
   };
-  environment.persistence."/persist".directories = [ "/export/KittyNFS" ];
 }
diff --git a/hosts/midas/filesystems/default.nix b/hosts/midas/filesystems/default.nix
index cdcf109..53dda74 100644
--- a/hosts/midas/filesystems/default.nix
+++ b/hosts/midas/filesystems/default.nix
@@ -3,7 +3,7 @@
   fileSystems = {
     # Network mounts
     "/home/${config.sysusers.main}/KittyNFS" = {
-      device = "${config.ips.server}:/export/KittyNFS";
+      device = "${config.ips.server}:/storage";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
     };
diff --git a/hosts/prophet/filesystems/default.nix b/hosts/prophet/filesystems/default.nix
index ecf65f0..c7e595c 100644
--- a/hosts/prophet/filesystems/default.nix
+++ b/hosts/prophet/filesystems/default.nix
@@ -1,11 +1,8 @@
 { ... }:
 {
-  fileSystems = {
-    # Misc bulk storage
-    "/export/Bulk" = {
-      device = "/dev/disk/by-uuid/ef465845-cc56-4db5-9260-8ae515eb025e";
-      fsType = "btrfs";
-      noCheck = true;
-    };
+  fileSystems."/persist/storage" = {
+    device = "/dev/disk/by-uuid/ef465845-cc56-4db5-9260-8ae515eb025e";
+    fsType = "btrfs";
+    noCheck = true;
   };
 }
diff --git a/hosts/redmond/filesystems/default.nix b/hosts/redmond/filesystems/default.nix
index da74246..47808d5 100644
--- a/hosts/redmond/filesystems/default.nix
+++ b/hosts/redmond/filesystems/default.nix
@@ -6,7 +6,7 @@
       options = [ "nosuid" "nodev" ];
     };
     "/home/${config.sysusers.main}/KittyNFS" = {
-      device = "10.100.0.1:/export/KittyNFS";
+      device = "10.100.0.1:/storage";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
     };
diff --git a/hosts/tower/filesystems/default.nix b/hosts/tower/filesystems/default.nix
index d1a9fb2..d759827 100644
--- a/hosts/tower/filesystems/default.nix
+++ b/hosts/tower/filesystems/default.nix
@@ -40,7 +40,7 @@
 
     # Network mounts
     "/home/${config.sysusers.main}/KittyNFS" = {
-      device = "${config.ips.server}:/export/KittyNFS";
+      device = "${config.ips.server}:/storage";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
     };
diff --git a/modules/system/devices/disks/impermanence/root/default.nix b/modules/system/devices/disks/impermanence/root/default.nix
index 9786f24..910a87d 100644
--- a/modules/system/devices/disks/impermanence/root/default.nix
+++ b/modules/system/devices/disks/impermanence/root/default.nix
@@ -3,6 +3,7 @@
   environment.persistence."/persist" = {
     hideMounts = true;
     directories = [
+      "/storage"
       "/etc/nixos"
       "/var/lib/nixos"
       { directory = "/etc/secureboot"; mode = "0700"; }
diff --git a/modules/system/services/server/fileserver/nfs/default.nix b/modules/system/services/server/fileserver/nfs/default.nix
index d343495..031de4e 100644
--- a/modules/system/services/server/fileserver/nfs/default.nix
+++ b/modules/system/services/server/fileserver/nfs/default.nix
@@ -3,9 +3,9 @@
   services.nfs.server = {
     enable = config.system.fileserver.enable;
     exports = ''
-      /export/KittyNFS/Files *(rw,sync,no_subtree_check)
-      /export/KittyNFS/Media *(rw,sync,no_subtree_check)
-      /export/KittyNFS/Music *(rw,sync,no_subtree_check)
+      /storage/Files *(rw,sync,no_subtree_check)
+      /storage/Media *(rw,sync,no_subtree_check)
+      /storage/Music *(rw,sync,no_subtree_check)
     '';
   };
 }
diff --git a/modules/system/services/server/icecast/liquidsoap/nixbops/default.nix b/modules/system/services/server/icecast/liquidsoap/nixbops/default.nix
index f296686..8d200cb 100644
--- a/modules/system/services/server/icecast/liquidsoap/nixbops/default.nix
+++ b/modules/system/services/server/icecast/liquidsoap/nixbops/default.nix
@@ -7,7 +7,7 @@
         settings.init.allow_root.set(true)
         settings.scheduler.fast_queues.set(2)
         
-        stream = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/KittyNFS/Music/NixBops"))
+        stream = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/storage/Music/NixBops"))
         stream_fallback = fallback([stream, stream])
         
         output.icecast(
diff --git a/modules/system/services/server/icecast/liquidsoap/nixscrap/default.nix b/modules/system/services/server/icecast/liquidsoap/nixscrap/default.nix
index ac7d6a7..aa52bcd 100644
--- a/modules/system/services/server/icecast/liquidsoap/nixscrap/default.nix
+++ b/modules/system/services/server/icecast/liquidsoap/nixscrap/default.nix
@@ -7,7 +7,7 @@
         settings.init.allow_root.set(true)
         settings.scheduler.fast_queues.set(2)
         
-        stream = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/KittyNFS/Music/Scrap"))
+        stream = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/storage/Music/Scrap"))
         stream_fallback = fallback([stream, stream])
         
         output.icecast(