diff --git a/modules/moodle-dl.nix b/modules/moodle-dl.nix
index 3d6d0ad..9b7a4d1 100644
--- a/modules/moodle-dl.nix
+++ b/modules/moodle-dl.nix
@@ -56,6 +56,7 @@ in {
     users.users.moodle-dl = {
       isSystemUser = true;
       home = cfg.directory;
+      group = "moodle-dl";
     };
 
     users.groups.moodle-dl = {};
diff --git a/modules/tuna.nix b/modules/tuna.nix
index bfea5ee..c2c230f 100644
--- a/modules/tuna.nix
+++ b/modules/tuna.nix
@@ -76,7 +76,11 @@ in {
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers.tuna.isSystemUser = true;
+    users.users.tuna = {
+      isSystemUser = true;
+      group = "tuna";
+    };
+    users.groups.tuna = {};
     # ref https://github.com/florianheinemann/MPD.FM/blob/9d037cf87597b26ae2f10ba9feea48946ad6cc68/service/MPD.FM.service
     systemd.services.tuna = {
       wantedBy = [ "multi-user.target" ];