diff --git a/system/modules/containers/default.nix b/system/modules/containers/default.nix
index 41ca7e9a..6d237079 100644
--- a/system/modules/containers/default.nix
+++ b/system/modules/containers/default.nix
@@ -71,8 +71,9 @@ in {
         vols = [
           "fileflows-cache:/temp:Z"
           "fileflows-data:/app/Data:Z"
-          "/home/christoph/HDD1/Video:/media"
-          "/home/christoph/HDD2/Video:/media"
+          "/media/Shows:/media/Shows"
+          "/media/Movies:/media/Movies"
+          "/media/Video:/media/Video"
         ];
       });
 
@@ -82,8 +83,8 @@ in {
         id-ports = [8989];
         vols = [
           "sonarr-config:/config:Z"
-          "/home/christoph/HDD2/Shows:/tv"
-          "/home/christoph/HDD2/SabNzbd:/downloads"
+          "/media/Shows:/media/Shows"
+          "/media/Usenet:/media/Usenet"
         ];
         netns = "wg0-de-115";
         netdns = "10.2.0.1";
@@ -94,8 +95,8 @@ in {
         id-ports = [7878];
         vols = [
           "radarr-config:/config:Z"
-          "/home/christoph/HDD2/Movies:/movies"
-          "/home/christoph/HDD2/SabNzbd:/downloads"
+          "/media/Movies:/media/Movies"
+          "/media/Usenet:/media/Usenet"
         ];
         netns = "wg0-de-115";
         netdns = "10.2.0.1";
@@ -106,7 +107,7 @@ in {
         id-ports = [5076];
         vols = [
           "hydra-config:/config:Z"
-          "/home/christoph/HDD2/SabNzbd:/downloads"
+          "/media/Usenet:/media/Usenet"
         ];
         netns = "wg0-de-115";
         netdns = "10.2.0.1";
@@ -117,8 +118,7 @@ in {
         id-ports = [8080];
         vols = [
           "sabnzbd-config:/config:Z"
-          "/home/christoph/HDD2/SabNzbd:/downloads"
-          "/home/christoph/HDD2/.sabnzbd:/incomplete-downloads"
+          "/media/Usenet:/media/Usenet"
         ];
         netns = "wg0-de-115";
         netdns = "10.2.0.1";
diff --git a/system/servenix/hardware-configuration.nix b/system/servenix/hardware-configuration.nix
index 0fe12dbf..89309612 100644
--- a/system/servenix/hardware-configuration.nix
+++ b/system/servenix/hardware-configuration.nix
@@ -53,6 +53,16 @@
       in ["${automount_opts},credentials=/home/christoph/samba.login"];
   };
 
+  fileSystems."/media/Usenet" = {
+    device = "//192.168.86.100/Usenet";
+      fsType = "cifs";
+      options = let
+        # this line prevents hanging on network split
+        automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
+
+      in ["${automount_opts},credentials=/home/christoph/samba.login"];
+  };
+
   swapDevices = lib.mkForce [
     # {
     #   device = "/var/swap";