diff --git a/flake.nix b/flake.nix
index 5d72c4b..d80f689 100644
--- a/flake.nix
+++ b/flake.nix
@@ -98,6 +98,7 @@
         createUser = name: args:
           ({ pkgs, ... }@args2:
             (createUser' name args) ({ inherit home-manager; } // args2));
+        createMediaGroup = { ... }: { users.groups.media = { gid = 600; }; };
       };
     in rec {
 
@@ -111,8 +112,9 @@
             hardwareConfig = ./hardware/home-pc.nix;
             config = ./home-pc.nix;
           })
+          lib.createMediaGroup
           (lib.createUser "felschr" {
-            user.extraGroups = [ "wheel" "audio" "docker" "disk" ];
+            user.extraGroups = [ "wheel" "audio" "disk" "media" ];
             modules = [ homeManagerModules.git ];
             config = ./home/felschr.nix;
           })
@@ -132,7 +134,7 @@
             config = ./work-pc.nix;
           })
           (lib.createUser "felschr" {
-            user.extraGroups = [ "wheel" "audio" "docker" "disk" ];
+            user.extraGroups = [ "wheel" "audio" "disk" ];
             modules = [ homeManagerModules.git ];
             config = ./home/felschr-work.nix;
           })
@@ -148,6 +150,7 @@
             hardwareConfig = ./hardware/rpi4.nix;
             config = ./home-server.nix;
           })
+          lib.createMediaGroup
           (lib.createUser "felschr" {
             user = {
               extraGroups = [ "wheel" "audio" "disk" "media" ];
diff --git a/services/calibre-web.nix b/services/calibre-web.nix
index de2621d..275a651 100644
--- a/services/calibre-web.nix
+++ b/services/calibre-web.nix
@@ -4,6 +4,7 @@ let port = 8088;
 in {
   services.calibre-web = {
     enable = true;
+    group = "media";
     listen.ip = "::1";
     listen.port = port;
     options.enableBookUploading = true;
diff --git a/services/jellyfin.nix b/services/jellyfin.nix
index 52941cc..610ff25 100644
--- a/services/jellyfin.nix
+++ b/services/jellyfin.nix
@@ -1,8 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  users.groups.media = { };
-
   services.jellyfin.enable = true;
   services.jellyfin.group = "media";
   services.jellyfin.openFirewall = true;
diff --git a/services/samba/home-server.nix b/services/samba/home-server.nix
index f3f986d..14a38d7 100644
--- a/services/samba/home-server.nix
+++ b/services/samba/home-server.nix
@@ -22,7 +22,7 @@
         "create mask" = "0644";
         "directory mask" = "0755";
         "force user" = "felschr";
-        "force group" = "users";
+        "force group" = "media";
       };
     };
   };