diff --git a/hosts/sobotka/default.nix b/hosts/sobotka/default.nix
index 576c6396..832b2d1e 100644
--- a/hosts/sobotka/default.nix
+++ b/hosts/sobotka/default.nix
@@ -36,6 +36,7 @@ in {
       "sonarr"
       "radarr"
       "media"
+      "share"
     ];
   };
 
diff --git a/modules/server/default.nix b/modules/server/default.nix
index 7bbad9c7..da9b8250 100644
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -70,6 +70,5 @@ in {
         group = cfg.group;
       };
     };
-    users.groups.media = {};
   };
 }
diff --git a/modules/server/lidarr/default.nix b/modules/server/lidarr/default.nix
index 387b5518..429167a6 100644
--- a/modules/server/lidarr/default.nix
+++ b/modules/server/lidarr/default.nix
@@ -39,6 +39,8 @@ in {
   config = lib.mkIf cfg.enable {
     services.${unit} = {
       enable = true;
+      user = srv.user;
+      group = srv.group;
     };
     services.caddy.virtualHosts."${cfg.url}" = {
       useACMEHost = srv.domain;
@@ -46,16 +48,16 @@ in {
         reverse_proxy http://127.0.0.1:8686
       '';
     };
-    users = {
-      users.lidarr = {
-        uid = 306;
-        group = "lidarr";
-        extraGroups = ["media"];
-        isSystemUser = true;
-      };
-      groups.lidarr = {
-        gid = 306;
-      };
-    };
+    # users = {
+    #   users.lidarr = {
+    #     uid = 306;
+    #     group = "lidarr";
+    #     extraGroups = ["media"];
+    #     isSystemUser = true;
+    #   };
+    #   groups.lidarr = {
+    #     gid = 306;
+    #   };
+    # };
   };
 }
diff --git a/modules/server/prowlarr/default.nix b/modules/server/prowlarr/default.nix
index 2401df81..d05fa833 100644
--- a/modules/server/prowlarr/default.nix
+++ b/modules/server/prowlarr/default.nix
@@ -39,6 +39,8 @@ in {
   config = lib.mkIf cfg.enable {
     services.${unit} = {
       enable = true;
+      user = srv.user;
+      group = srv.group;
     };
     services.caddy.virtualHosts."${cfg.url}" = {
       useACMEHost = srv.domain;
@@ -46,10 +48,10 @@ in {
         reverse_proxy http://127.0.0.1:9696
       '';
     };
-    users.users.prowlarr = {
-      group = "prowlarr";
-      isSystemUser = true;
-    };
-    users.groups.prowlarr = {};
+    # users.users.prowlarr = {
+    #   group = "prowlarr";
+    #   isSystemUser = true;
+    # };
+    # users.groups.prowlarr = {};
   };
 }
diff --git a/modules/server/qbittorrent/default.nix b/modules/server/qbittorrent/default.nix
index 4ef2e419..165a7e67 100644
--- a/modules/server/qbittorrent/default.nix
+++ b/modules/server/qbittorrent/default.nix
@@ -4,6 +4,9 @@
   ...
 }: let
   cfg = config.server.qbittorrent;
+  srv = config.server;
+  # uid = 899;
+  # gid = 777;
 in {
   options.server.qbittorrent = {
     enable = lib.mkEnableOption "Enable qBittorrent";
@@ -46,6 +49,7 @@ in {
 
     virtualisation.oci-containers.containers = {
       qbittorrent = {
+        user = "${srv.user}:${srv.group}";
         image = "linuxserver/qbittorrent:latest";
         autoStart = true;
         dependsOn = ["gluetun"];
@@ -57,15 +61,15 @@ in {
           "--network=container:gluetun"
         ];
         volumes = [
-          "config:/var/lib/"
-          "downloads:/home/media/"
+          "config:/var/lib/qbittorrent"
+          "downloads:/home/media/downloads"
         ];
         environmentFiles = [
           config.age.secrets.gluetunEnv.path
         ];
         environment = {
-          PUID = "899";
-          PGID = "777";
+          # PUID = toString uid;
+          # PGID = toString gid;
           TZ = "Europe/Stockholm";
           WEBUI_PORT = "${builtins.toString cfg.port}";
         };
@@ -96,16 +100,15 @@ in {
       };
     };
 
-    users = {
-      users.qbittorrent = {
-        uid = 899;
-        group = "media";
-        # extraGroups = ["media"];
-        isSystemUser = true;
-      };
-    };
-    users.groups.media = {
-      gid = 777;
-    };
+    # users = {
+    #   users.qbittorrent = {
+    #     inherit uid;
+    #     group = "qbittorrent";
+    #     isSystemUser = true;
+    #   };
+    #   groups.qbittorrent = {
+    #     inherit gid;
+    #   };
+    # };
   };
 }