diff --git a/modules/media/arr-suite.nix b/modules/media/arr-suite.nix
index f2f2ddb..c19fdd8 100644
--- a/modules/media/arr-suite.nix
+++ b/modules/media/arr-suite.nix
@@ -30,11 +30,34 @@
       openFirewall = false;
     };
 
-    # Add users to the media group
-    users.users.sonarr.extraGroups = [ "media_services" ];
-    users.users.radarr.extraGroups = [ "media_services" ];
-    users.users.readarr.extraGroups = [ "media_services" ];
-    users.users.prowlarr.extraGroups = [ "media_services" ];
+    # Define users and groups
+    users.users.sonarr = {
+      isSystemUser = true;
+      group = "sonarr";
+      extraGroups = [ "media_services" ];
+    };
+    users.groups.sonarr = {};
+
+    users.users.radarr = {
+      isSystemUser = true;
+      group = "radarr";
+      extraGroups = [ "media_services" ];
+    };
+    users.groups.radarr = {};
+
+    users.users.readarr = {
+      isSystemUser = true;
+      group = "readarr";
+      extraGroups = [ "media_services" ];
+    };
+    users.groups.readarr = {};
+
+    users.users.prowlarr = {
+      isSystemUser = true;
+      group = "prowlarr";
+      extraGroups = [ "media_services" ];
+    };
+    users.groups.prowlarr = {};
 
     # Configure unpackerr
     environment.systemPackages = [ pkgs.unpackerr ];
diff --git a/modules/media/qbittorrent.nix b/modules/media/qbittorrent.nix
index cfed84c..4b18d69 100644
--- a/modules/media/qbittorrent.nix
+++ b/modules/media/qbittorrent.nix
@@ -78,15 +78,6 @@ in
       };
     };
 
-    users.users = mkIf (cfg.user == "qbittorrent") {
-      qbittorrent = {
-        group = cfg.group;
-        extraGroups = [ "media_services" ];
-      };
-    };
-
-    users.groups = mkIf (cfg.group == "qbittorrent") {
-      qbittorrent = {};
-    };
+    
   };
 }
diff --git a/modules/nixos/homelab/services.nix b/modules/nixos/homelab/services.nix
index 0ad5c67..28e800f 100644
--- a/modules/nixos/homelab/services.nix
+++ b/modules/nixos/homelab/services.nix
@@ -30,16 +30,14 @@
     port = 13378;
   };
 
-  services.qbittorrent = {
-    enable = true;
-    profileDir = "/storage/services/qbittorrent";
-    user = "qbittorrent";
-    group = "media_services";
-    webuiPort = 8090;
-    openFirewall = true;
-    package = pkgs.qbittorrent-nox;
+  users.users.qbittorrent = {
+    isSystemUser = true;
+    group = "qbittorrent";
+    extraGroups = [ "media_services" ];
   };
 
+  users.groups.qbittorrent = { };
+
   systemd.tmpfiles.rules = [
     "d /storage/services/qbittorrent 0755 qbittorrent media_services - -"
     "d /storage/services/qbittorrent/config 0755 qbittorrent media_services - -"