diff --git a/hosts/firefly/system/hardware/default.nix b/hosts/firefly/system/hardware/default.nix
index 2edf666..6c0e395 100644
--- a/hosts/firefly/system/hardware/default.nix
+++ b/hosts/firefly/system/hardware/default.nix
@@ -91,8 +91,58 @@
     };
 
     # Network mounts
-    "/home/jimbo/JimboNFS" = {
-      device = "${config.ips.server}:/export/JimboNFS";
+    "/home/jimbo/JimboNFS/Downloads" = {
+      device = "${config.ips.server}:/export/JimboNFS/Downloads";
+      fsType = "nfs4";
+      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
+    };
+    "/home/jimbo/JimboNFS/Documents" = {
+      device = "${config.ips.server}:/export/JimboNFS/Documents";
+      fsType = "nfs4";
+      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
+    };
+    "/home/jimbo/JimboNFS/Documents" = {
+      device = "${config.ips.server}:/export/JimboNFS/Documents";
+      fsType = "nfs4";
+      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
+    };
+    "/home/jimbo/JimboNFS/Photos" = {
+      device = "${config.ips.server}:/export/JimboNFS/Photos";
+      fsType = "nfs4";
+      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
+    };
+    "/home/jimbo/JimboNFS/Videos/Random" = {
+      device = "${config.ips.server}:/export/JimboNFS/Videos/Random";
+      fsType = "nfs4";
+      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
+    };
+    "/home/jimbo/JimboNFS/Videos/Media" = {
+      device = "${config.ips.server}:/export/JimboNFS/Videos/Media";
+      fsType = "nfs4";
+      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
+    };
+    "/home/jimbo/JimboNFS/Music/Synced" = {
+      device = "${config.ips.server}:/export/JimboNFS/Music/Synced";
+      fsType = "nfs4";
+      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
+    };
+    "/home/jimbo/JimboNFS/Music/Unsynced" = {
+      device = "${config.ips.server}:/export/JimboNFS/Music/Unsynced";
+      fsType = "nfs4";
+      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
+    };
+    "/home/jimbo/JimboNFS/Projects" = {
+      device = "${config.ips.server}:/export/JimboNFS/Projects";
+      fsType = "nfs4";
+      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
+    };
+    "/home/jimbo/JimboNFS/School" = {
+      device = "${config.ips.server}:/export/JimboNFS/School";
+      fsType = "nfs4";
+      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
+    };
+    "/home/jimbo/JimboNFS/School" = {
+      device = "${config.ips.server}:/export/JimboNFS/School";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
     };
diff --git a/modules/system/services/server/fileserver/local/nfs/default.nix b/modules/system/services/server/fileserver/local/nfs/default.nix
index 7dd1502..ce8f721 100644
--- a/modules/system/services/server/fileserver/local/nfs/default.nix
+++ b/modules/system/services/server/fileserver/local/nfs/default.nix
@@ -3,7 +3,15 @@
   services.nfs.server = {
     enable = true;
     exports = ''
-      /export/JimboNFS *(rw,no_subtree_check)
+      /export/JimboNFS/Downloads *(rw,sync,no_subtree_check)
+      /export/JimboNFS/Documents *(rw,sync,no_subtree_check)
+      /export/JimboNFS/Photos *(rw,sync,no_subtree_check)
+      /export/JimboNFS/Videos/Random *(rw,sync,no_subtree_check)
+      /export/JimboNFS/Videos/Media *(rw,sync,no_subtree_check)
+      /export/JimboNFS/Music/Synced *(rw,sync,no_subtree_check)
+      /export/JimboNFS/Music/Unsynced *(rw,sync,no_subtree_check)
+      /export/JimboNFS/Projects *(rw,sync,no_subtree_check)
+      /export/JimboNFS/School *(rw,sync,no_subtree_check)
     '';
   };
 }