diff --git a/config/device.nix b/config/device.nix
index 2b934cb..d72276c 100755
--- a/config/device.nix
+++ b/config/device.nix
@@ -101,7 +101,7 @@ in {
         options = sambaPermissions ++ userIdForUser1;
       };
       # Minecraft Worlds
-      folder4 = {
+      folder2 = {
         mount = "/home/${user1}/.local/share/PrismLauncher/instances/1.21/.minecraft/saves";
         device = "//${nasIP}/homes/${user1Name}/Minecraft";
         options = sambaPermissions ++ userIdForUser1;
diff --git a/systems/desktop/filesystem.nix b/systems/desktop/filesystem.nix
index 0246345..42ce3aa 100755
--- a/systems/desktop/filesystem.nix
+++ b/systems/desktop/filesystem.nix
@@ -6,6 +6,7 @@
   inherit (flake.config.people) user0 user1;
   inherit (flake.config.system.device) desktop server nas;
   inherit (flake.config.service.instance) samba;
+
   synologySecrets = config.sops.secrets."network/synology".path;
   serverSecrets = config.sops.secrets."network/server".path;
 in {
@@ -14,7 +15,6 @@ in {
       "folder0"
       "folder1"
       "folder2"
-      "folder3"
     ];
 
     storageDrives = [
@@ -31,7 +31,9 @@ in {
       value = {
         device = nas.${synologyDrive}.device;
         fsType = "cifs";
-        options = nas.${synologyDrive}.options ++ ["credentials=${synologySecrets}"];
+        options =
+          nas.${synologyDrive}.options
+          ++ ["credentials=${synologySecrets}"];
       };
     };
 
@@ -49,7 +51,9 @@ in {
       value = {
         device = "${server.${sambaDrive}.device}/${samba.paths.path1}";
         fsType = "cifs";
-        options = server.${sambaDrive}.options ++ ["credentials=${serverSecrets}"];
+        options =
+          server.${sambaDrive}.options
+          ++ ["credentials=${serverSecrets}"];
       };
     };
   in
diff --git a/systems/laptop/filesystem.nix b/systems/laptop/filesystem.nix
index 7eeac1a..683afd9 100755
--- a/systems/laptop/filesystem.nix
+++ b/systems/laptop/filesystem.nix
@@ -5,6 +5,7 @@
 }: let
   inherit (flake.config.people) user0 user1;
   inherit (flake.config.system.device) laptop nas server;
+  inherit (flake.config.service.instance) samba;
 
   synologySecrets = config.sops.secrets."network/synology".path;
   serverSecrets = config.sops.secrets."network/server".path;
@@ -13,28 +14,32 @@ in {
     synologyDrives = [
       "folder0"
       "folder1"
-      "folder4"
+      "folder2"
     ];
 
     sambaDrives = [
       "samba0"
     ];
 
-    synologyMounts = folder: {
-      name = "${nas.${folder}.mount}";
+    synologyMounts = synologyDrive: {
+      name = "${nas.${synologyDrive}.mount}";
       value = {
-        device = nas.${folder}.device;
+        device = nas.${synologyDrive}.device;
         fsType = "cifs";
-        options = nas.${folder}.options ++ ["credentials=${synologySecrets}"];
+        options =
+          nas.${synologyDrive}.options
+          ++ ["credentials=${synologySecrets}"];
       };
     };
 
-    sambaMounts = samba: {
-      name = "${server.${samba}.mount}";
+    sambaMounts = sambaDrive: {
+      name = "${server.${sambaDrive}.mount}/${samba.paths.path1}";
       value = {
-        device = server.${samba}.device;
+        device = "${server.${sambaDrive}.device}/${samba.paths.path1}";
         fsType = "cifs";
-        options = server.${samba}.options ++ ["credentials=${serverSecrets}"];
+        options =
+          server.${sambaDrive}.options
+          ++ ["credentials=${serverSecrets}"];
       };
     };
   in