diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix
index 89d1af5..3923715 100644
--- a/configurations/nixos/defiant/configuration.nix
+++ b/configurations/nixos/defiant/configuration.nix
@@ -55,18 +55,18 @@
       enable = true;
       directories = [
         {
-          folder = "leyla";
+          folder = "leyla_documents";
           user = "leyla";
           group = "leyla";
           bind = "/home/leyla/documents";
         }
         {
-          folder = "eve";
+          folder = "eve_documents";
           user = "eve";
           group = "eve";
         }
         {
-          folder = "users";
+          folder = "users_documents";
           user = "root";
           group = "users";
         }
@@ -79,7 +79,7 @@
       ];
       nfs = {
         enable = true;
-        directories = ["leyla" "eve"];
+        directories = ["leyla_documents" "eve_documents" "users_documents" "media"];
       };
     };
     reverse_proxy = {
diff --git a/configurations/nixos/horizon/hardware-configuration.nix b/configurations/nixos/horizon/hardware-configuration.nix
index f5342a1..65c2aa2 100644
--- a/configurations/nixos/horizon/hardware-configuration.nix
+++ b/configurations/nixos/horizon/hardware-configuration.nix
@@ -39,19 +39,19 @@
     };
 
     "/mnt/leyla_documents" = {
-      device = "defiant:/exports/leyla";
+      device = "defiant:/exports/leyla_documents";
       fsType = "nfs";
       options = ["x-systemd.automount" "user" "noatime" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc"];
     };
 
     "/mnt/eve_documents" = {
-      device = "defiant:/exports/eve";
+      device = "defiant:/exports/eve_documents";
       fsType = "nfs";
       options = ["x-systemd.automount" "user" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc"];
     };
 
     "/mnt/users_documents" = {
-      device = "defiant:/exports/users";
+      device = "defiant:/exports/users_documents";
       fsType = "nfs";
       options = ["x-systemd.automount" "user" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc"];
     };
diff --git a/modules/nixos-modules/server/network_storage/nfs.nix b/modules/nixos-modules/server/network_storage/nfs.nix
index 9aaab39..b398582 100644
--- a/modules/nixos-modules/server/network_storage/nfs.nix
+++ b/modules/nixos-modules/server/network_storage/nfs.nix
@@ -38,15 +38,18 @@
         services.nfs.server = {
           enable = true;
           exports = lib.strings.concatLines (
-            lib.lists.imap0 (
-              i: directory: "${directory._directory} 100.64.0.0/10(rw,sync,no_subtree_check,crossmnt,fsid=${builtins.toString i})"
-            )
-            (
-              builtins.filter (
-                directory: lib.lists.any (target: target == directory.folder) config.host.network_storage.nfs.directories
+            [
+              "/export 100.64.0.0/10(rw,fsid=0,no_subtree_check)"
+            ]
+            ++ (builtins.map (
+                directory: "${directory._directory} 100.64.0.0/10(rw,nohide,sync,no_subtree_check,crossmnt)"
               )
-              config.host.network_storage.directories
-            )
+              (
+                builtins.filter (
+                  directory: lib.lists.any (target: target == directory.folder) config.host.network_storage.nfs.directories
+                )
+                config.host.network_storage.directories
+              ))
           );
         };
         networking.firewall.interfaces.${config.services.tailscale.interfaceName}.allowedTCPPorts = [