diff --git a/modules/nixos/bundles/server.nix b/modules/nixos/bundles/server.nix
index f5aede1..36b7329 100644
--- a/modules/nixos/bundles/server.nix
+++ b/modules/nixos/bundles/server.nix
@@ -29,7 +29,5 @@
     # keep-sorted end
   ];
 
-  users.groups.media = { };
-
   services.borgmatic.settings.source_directories = [ "/srv" ];
 }
diff --git a/modules/nixos/features/bazarr.nix b/modules/nixos/features/bazarr.nix
index c1ebae6..5407a2f 100644
--- a/modules/nixos/features/bazarr.nix
+++ b/modules/nixos/features/bazarr.nix
@@ -6,7 +6,7 @@ in
     bazarr = {
       enable = true;
       dataDir = "/srv/bazarr";
-      group = "media";
+      group = "srv";
       listenPort = port;
     };
 
diff --git a/modules/nixos/features/jellyfin.nix b/modules/nixos/features/jellyfin.nix
index 330adff..a4490be 100644
--- a/modules/nixos/features/jellyfin.nix
+++ b/modules/nixos/features/jellyfin.nix
@@ -6,7 +6,7 @@ in
     jellyfin = {
       enable = true;
       dataDir = "/srv/jellyfin";
-      group = "media";
+      group = "srv";
     };
 
     nginx.virtualHosts."jellyfin.fi33.buzz" = {
diff --git a/modules/nixos/features/lidarr.nix b/modules/nixos/features/lidarr.nix
index 8132318..0b6fb4b 100644
--- a/modules/nixos/features/lidarr.nix
+++ b/modules/nixos/features/lidarr.nix
@@ -9,7 +9,7 @@ in
       settings.server = {
         inherit port;
       };
-      group = "media";
+      group = "srv";
     };
 
     nginx.virtualHosts."lidarr.fi33.buzz" = {
diff --git a/modules/nixos/features/qbittorrent.nix b/modules/nixos/features/qbittorrent.nix
index 0134eb1..f4e8d54 100644
--- a/modules/nixos/features/qbittorrent.nix
+++ b/modules/nixos/features/qbittorrent.nix
@@ -7,7 +7,7 @@ in
       enable = true;
       webuiPort = port;
       profileDir = "/srv";
-      group = "media";
+      group = "srv";
       extraArgs = [
         "--confirm-legal-notice"
       ];
@@ -19,6 +19,4 @@ in
       locations."/".proxyPass = "http://localhost:${toString port}";
     };
   };
-
-  users.users.qbittorrent.extraGroups = [ "media" ];
 }
diff --git a/modules/nixos/features/radarr.nix b/modules/nixos/features/radarr.nix
index 8cce599..8cbcc4c 100644
--- a/modules/nixos/features/radarr.nix
+++ b/modules/nixos/features/radarr.nix
@@ -9,7 +9,7 @@ in
       settings.server = {
         inherit port;
       };
-      group = "media";
+      group = "srv";
     };
 
     nginx.virtualHosts."radarr.fi33.buzz" = {
diff --git a/modules/nixos/features/readarr.nix b/modules/nixos/features/readarr.nix
index f0f3227..4f8e419 100644
--- a/modules/nixos/features/readarr.nix
+++ b/modules/nixos/features/readarr.nix
@@ -9,21 +9,9 @@ in
       settings.server = {
         inherit port;
       };
-      group = "media";
+      group = "srv";
     };
 
-    # borgmatic.settings = {
-    #   source_directories = [ ];
-    #   postgresql_databases = [
-    #     {
-    #       name = "readarr";
-    #       hostname = "localhost";
-    #       username = "root";
-    #       password = "{credential systemd borgmatic-pg}";
-    #     }
-    #   ];
-    # };
-
     nginx.virtualHosts."readarr.fi33.buzz" = {
       forceSSL = true;
       useACMEHost = "fi33.buzz";
diff --git a/modules/nixos/features/sonarr.nix b/modules/nixos/features/sonarr.nix
index f5ff5b3..f0d0a26 100644
--- a/modules/nixos/features/sonarr.nix
+++ b/modules/nixos/features/sonarr.nix
@@ -9,7 +9,7 @@ in
       settings.server = {
         inherit port;
       };
-      group = "media";
+      group = "srv";
     };
 
     nginx.virtualHosts."sonarr.fi33.buzz" = {