diff --git a/dotfiles/unpackerr.conf b/dotfiles/unpackerr.conf
index c049ce9..bf92678 100644
--- a/dotfiles/unpackerr.conf
+++ b/dotfiles/unpackerr.conf
@@ -83,7 +83,7 @@ dir_mode = "0775"
 url = "http://localhost:8989"
 api_key = "52869fe7bec4482dafb21c4053fe71e4"
 ## File system path where downloaded Sonarr items are located.
-paths = ['/mnt/pool/multimedia/downloads/torrent']
+paths = ['/srv/pool/multimedia/downloads/torrent']
 ## Default protocols is torrent. Alternative: "torrent,usenet"
 protocols = "torrent"
 ## How long to wait for a reply from the backend.
@@ -101,7 +101,7 @@ delete_delay = "5m"
 url = "http://127.0.0.1:7878"
 api_key = "a987ac45ca2c47bc88e762031ea33296"
 ## File system path where downloaded Radarr items are located.
-paths = ['/mnt/pool/multimedia/downloads/torrent']
+paths = ['/srv/pool/multimedia/downloads/torrent']
 ## Default protocols is torrents. Alternative: "torrent,usenet"
 protocols = "torrent"
 ## How long to wait for a reply from the backend.
diff --git a/home-manager.nix b/home-manager.nix
index 2884f09..b49420d 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -22,7 +22,7 @@
       sc = "systemctl --user";
       jc = "journalctl --user -xefu";
       open-gallery = ''
-        cd /mnt/miniserver/pool/scrapping/JawZ/gallery-dl &&
+        cd /srv/miniserver/pool/scrapping/JawZ/gallery-dl &&
         xdg-open "$(fd . ./ Husbands -tdirectory -d 1 | fzf -i)"'';
     };
     enableVteIntegration = true;
diff --git a/hosts/miniserver/configuration.nix b/hosts/miniserver/configuration.nix
index d9539a4..a181f54 100644
--- a/hosts/miniserver/configuration.nix
+++ b/hosts/miniserver/configuration.nix
@@ -195,7 +195,7 @@
       openFirewall = true;
       settings = {
         inotify = "yes";
-        media_dir = [ "/mnt/pool/" ];
+        media_dir = [ "/srv/pool/" ];
       };
     };
   };
diff --git a/hosts/miniserver/hardware-configuration.nix b/hosts/miniserver/hardware-configuration.nix
index 39d4b78..57b26b3 100644
--- a/hosts/miniserver/hardware-configuration.nix
+++ b/hosts/miniserver/hardware-configuration.nix
@@ -79,7 +79,7 @@
         "datacow"
       ];
     };
-    # "/mnt/pool" = {
+    # "/srv/pool" = {
     #   device = "/dev/disk/by-uuid/1e7cf787-e34d-4e3e-ac3c-0c07309dbd34";
     #   fsType = "btrfs";
     #   options = [
@@ -99,25 +99,25 @@
       fsType = "vfat";
     };
     "/var/lib/nextcloud/data" = {
-      device = "/mnt/pool/nextcloud";
+      device = "/srv/pool/nextcloud";
       options = [ "bind" ];
-      depends = [ "/mnt/pool" ];
+      depends = [ "/srv/pool" ];
     };
-    # "/mnt/jellyfin/media" = {
-    #   device = "/mnt/pool/multimedia/media";
+    # "/srv/jellyfin/media" = {
+    #   device = "/srv/pool/multimedia/media";
     #   options = [ "bind" "ro" ];
-    #   depends = [ "/mnt/pool" ];
+    #   depends = [ "/srv/pool" ];
     # };
     # NFS
     "/export/pool" = {
-      device = "/mnt/pool";
+      device = "/srv/pool";
       options = [ "bind" ];
-      depends = [ "/mnt/pool" ];
+      depends = [ "/srv/pool" ];
     };
     "/export/jawz" = {
       device = "/home/jawz";
       options = [ "bind" ];
-      depends = [ "/mnt/pool" ];
+      depends = [ "/srv/pool" ];
     };
   };
   services.nfs = {
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index 7619749..3dddfc2 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -100,7 +100,7 @@
       settings = {
         inotify = "yes";
         media_dir = [
-          "/mnt/pool"
+          "/srv/pool"
           "/home/jawz"
         ];
       };
diff --git a/hosts/server/hardware-configuration.nix b/hosts/server/hardware-configuration.nix
index 2a2faef..a061b6e 100644
--- a/hosts/server/hardware-configuration.nix
+++ b/hosts/server/hardware-configuration.nix
@@ -108,7 +108,7 @@
         "datacow"
       ];
     };
-    "/mnt/pool" = {
+    "/srv/pool" = {
       device = "/dev/disk/by-uuid/1e7cf787-e34d-4e3e-ac3c-0c07309dbd34";
       fsType = "btrfs";
       options = [
@@ -130,28 +130,28 @@
     };
     # NEXTCCLOUD
     "/var/lib/nextcloud/data" = {
-      device = "/mnt/pool/nextcloud";
+      device = "/srv/pool/nextcloud";
       options = [ "bind" ];
-      depends = [ "/mnt/pool" ];
+      depends = [ "/srv/pool" ];
     };
-    "/mnt/jellyfin/media" = {
-      device = "/mnt/pool/multimedia/media";
+    "/srv/jellyfin/media" = {
+      device = "/srv/pool/multimedia/media";
       options = [
         "bind"
         "ro"
       ];
-      depends = [ "/mnt/pool" ];
+      depends = [ "/srv/pool" ];
     };
     # NFS
     "/export/pool" = {
-      device = "/mnt/pool";
+      device = "/srv/pool";
       options = [ "bind" ];
-      depends = [ "/mnt/pool" ];
+      depends = [ "/srv/pool" ];
     };
     "/export/jawz" = {
       device = "/home/jawz";
       options = [ "bind" ];
-      depends = [ "/mnt/pool" ];
+      depends = [ "/srv/pool" ];
     };
   };
   services.nfs = {
diff --git a/hosts/workstation/hardware-configuration.nix b/hosts/workstation/hardware-configuration.nix
index 7b40b01..321ead9 100644
--- a/hosts/workstation/hardware-configuration.nix
+++ b/hosts/workstation/hardware-configuration.nix
@@ -93,11 +93,11 @@
     {
       "/" = btrfsMount "nixos" // { };
       "/home" = btrfsMount "home" // { };
-      "/mnt/games" = btrfsMount "games" // { };
-      "/mnt/miniserver/pool" = nfsMount "miniserver" "pool" // { };
-      "/mnt/miniserver/jawz" = nfsMount "miniserver" "jawz" // { };
-      "/mnt/server/pool" = nfsMount "server" "pool" // { };
-      "/mnt/server/jawz" = nfsMount "server" "jawz" // { };
+      "/srv/games" = btrfsMount "games" // { };
+      "/srv/miniserver/pool" = nfsMount "miniserver" "pool" // { };
+      "/srv/miniserver/jawz" = nfsMount "miniserver" "jawz" // { };
+      "/srv/server/pool" = nfsMount "server" "pool" // { };
+      "/srv/server/jawz" = nfsMount "server" "jawz" // { };
       "/boot" = {
         device = "/dev/disk/by-uuid/ac6d349a-96b9-499e-9009-229efd7743a5";
         fsType = "ext4";
diff --git a/modules/servers/lidarr.nix b/modules/servers/lidarr.nix
index f3538a4..6303b41 100644
--- a/modules/servers/lidarr.nix
+++ b/modules/servers/lidarr.nix
@@ -17,10 +17,10 @@ in
         PGID = "100";
       };
       volumes = [
-        "/mnt/pool/multimedia:/data"
-        "/mnt/pool/multimedia/media/Music:/music"
-        "/mnt/pool/multimedia/media/MusicVideos:/music-videos"
-        "/mnt/pool/multimedia/downloads/usenet:/usenet"
+        "/srv/pool/multimedia:/data"
+        "/srv/pool/multimedia/media/Music:/music"
+        "/srv/pool/multimedia/media/MusicVideos:/music-videos"
+        "/srv/pool/multimedia/downloads/usenet:/usenet"
         "${config.my.containerData}/lidarr/files:/config"
         "${config.my.containerData}/lidarr/custom-services.d:/custom-services.d"
         "${config.my.containerData}/lidarr/custom-cont-init.d:/custom-cont-init.d"
diff --git a/modules/servers/paperless.nix b/modules/servers/paperless.nix
index 0fc731b..fa0c8c1 100644
--- a/modules/servers/paperless.nix
+++ b/modules/servers/paperless.nix
@@ -7,7 +7,7 @@
       enable = true;
       address = "0.0.0.0";
       consumptionDirIsPublic = true;
-      consumptionDir = "/mnt/pool/scans/";
+      consumptionDir = "/srv/pool/scans/";
       settings = {
         PAPERLESS_DBENGINE = "postgress";
         PAPERLESS_DBNAME = "paperless";