diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index ed1129d75f2e..f1473367a7d9 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -123,7 +123,9 @@ let
   # - values: lists of `packagePlatformPath`s
   diffAttrs = builtins.fromJSON (builtins.readFile "${combined}/combined-diff.json");
 
+  changedPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.changed;
   rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.rebuilds;
+  removedPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.removed;
 
   changed-paths =
     let
@@ -160,10 +162,9 @@ let
 
   inherit
     (callPackage ./maintainers.nix {
-      affectedAttrPaths = map (a: a.packagePath) (
-        convertToPackagePlatformAttrs (diffAttrs.changed ++ diffAttrs.removed)
-      );
-      changedFiles = lib.importJSON touchedFilesJson;
+      changedattrs = lib.attrNames (lib.groupBy (a: a.name) changedPackagePlatformAttrs);
+      changedpathsjson = touchedFilesJson;
+      removedattrs = lib.attrNames (lib.groupBy (a: a.name) removedPackagePlatformAttrs);
     })
     users
     teams
@@ -180,7 +181,7 @@ runCommand "compare"
     ];
     users = builtins.toJSON users;
     teams = builtins.toJSON teams;
-    packages = builtins.toJSON (lib.map (lib.concatStringsSep ".") packages);
+    packages = builtins.toJSON packages;
     passAsFile = [
       "users"
       "teams"
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index 903e42f733f6..daecc1c154da 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -1,54 +1,70 @@
-# Figure out which maintainers (users/teams) are relevant for a PR:
-# - All maintainers that can be linked directly to changedFiles
-# - Maintainers of affectedAttrPaths if a file directly related to the attribute is in changedFiles
-#
-# Files and attributes are linked in various ways:
-# - pkgs/by-name/<attr>/* is linked to pkgs.<attr>
-# - The file position of various attributes of pkgs.<attr>
-# - Explicitly specified file positions in derivations
-#
-# Test with
-#   nix-instantiate --eval --strict --json test.nix -A result | jq
-#
-# Empty list as an output means success
 {
-  # Files that were changed
-  # Type: ListOf (Nixpkgs-root-relative path)
-  changedFiles,
-  # Attributes whose value was affected by the change
-  # Type: ListOf (ListOf String)
-  affectedAttrPaths,
-
-  pkgs ? import ../../.. {
+  lib,
+  changedattrs,
+  changedpathsjson,
+  removedattrs,
+}:
+let
+  pkgs = import ../../.. {
     system = "x86_64-linux";
     # We should never try to ping maintainers through package aliases, this can only lead to errors.
     # One example case is, where an attribute is a throw alias, but then re-introduced in a PR.
     # This would trigger the throw. By disabling aliases, we can fallback gracefully below.
     config.allowAliases = false;
-    overlays = [ ];
-  },
-  lib,
-}:
-let
-  nixpkgsRoot = toString ../../.. + "/";
-  stripNixpkgsRootFromKeys = lib.mapAttrs' (
-    file: value: lib.nameValuePair (lib.removePrefix nixpkgsRoot file) value
-  );
+  };
 
-  moduleMeta = (pkgs.nixos { }).config.meta;
+  changedpaths = lib.importJSON changedpathsjson;
 
-  # Currently just nixos module maintainers, but in the future we can use this for code owners too
-  fileUsers = stripNixpkgsRootFromKeys moduleMeta.maintainers;
-  fileTeams = stripNixpkgsRootFromKeys moduleMeta.teams;
+  # Extract attributes that changed from by-name paths.
+  # This allows pinging reviewers for pure refactors.
+  touchedattrs = lib.pipe changedpaths [
+    (lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed && changed != "pkgs/by-name/README.md"))
+    (map (lib.splitString "/"))
+    (map (path: lib.elemAt path 3))
+    lib.unique
+  ];
 
-  anyMatchingFile = filename: lib.any (lib.hasPrefix filename) changedFiles;
+  anyMatchingFile = filename: lib.any (lib.hasPrefix filename) changedpaths;
 
   anyMatchingFiles = files: lib.any anyMatchingFile files;
 
+  sharded = name: "${lib.substring 0 2 name}/${name}";
+
+  attrsWithMaintainers = lib.pipe (changedattrs ++ removedattrs ++ touchedattrs) [
+    # An attribute can appear in changed/removed *and* touched
+    lib.unique
+    (map (
+      name:
+      let
+        path = lib.splitString "." name;
+        # Some packages might be reported as changed on a different platform, but
+        # not even have an attribute on the platform the maintainers are requested on.
+        # Fallback to `null` for these to filter them out below.
+        package = lib.attrByPath path null pkgs;
+      in
+      {
+        inherit name package;
+        # Adds all files in by-name to each package, no matter whether they are discoverable
+        # via meta attributes below. For example, this allows pinging maintainers for
+        # updates to .json files.
+        # TODO: Support by-name package sets.
+        filenames = lib.optional (lib.length path == 1) "pkgs/by-name/${sharded (lib.head path)}/";
+        # meta.maintainers also contains all individual team members.
+        # We only want to ping individuals if they're added individually as maintainers, not via teams.
+        users = package.meta.nonTeamMaintainers or [ ];
+        teams = package.meta.teams or [ ];
+      }
+    ))
+    # No need to match up packages without maintainers with their files.
+    # This also filters out attributes where `package = null`, which is the
+    # case for libintl, for example.
+    (lib.filter (pkg: pkg.users != [ ] || pkg.teams != [ ]))
+  ];
+
   relevantFilenames =
     drv:
     (lib.unique (
-      map (pos: lib.removePrefix nixpkgsRoot pos.file) (
+      map (pos: lib.removePrefix "${toString ../../..}/" pos.file) (
         lib.filter (x: x != null) [
           (drv.meta.maintainersPosition or null)
           (drv.meta.teamsPosition or null)
@@ -71,82 +87,50 @@ let
       )
     ));
 
-  relevantAffectedAttrPaths = lib.filter (
-    attrPath:
-    # Some packages might be reported as changed on a different platform, but
-    # not even have an attribute on the platform the maintainers are requested on.
-    # Fallback to `null` for these to filter them out
-    let
-      package = lib.attrByPath attrPath null pkgs;
-    in
-    package != null && anyMatchingFiles (relevantFilenames package)
-  ) affectedAttrPaths;
+  attrsWithFilenames = map (
+    pkg: pkg // { filenames = pkg.filenames ++ relevantFilenames pkg.package; }
+  ) attrsWithMaintainers;
 
-  # Extract attributes that changed from by-name paths.
-  # This allows pinging reviewers for pure refactors.
-  changedByNameAttrPaths = lib.pipe changedFiles [
-    (lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed))
-    (map (lib.splitString "/"))
-    # Filters out e.g. pkgs/by-name/README.md
-    (lib.filter (path: lib.length path > 3))
-    (map (path: lib.elemAt path 3))
-    (map lib.singleton)
-  ];
-
-  # An attribute can appear in affected *and* touched
-  attrPathsToGetMaintainersFor = lib.unique (relevantAffectedAttrPaths ++ changedByNameAttrPaths);
-
-  attrPathEntities = lib.concatMap (
-    attrPath:
-    let
-      package = lib.getAttrFromPath attrPath pkgs;
-    in
-    # meta.maintainers also contains all individual team members.
-    # We only want to ping individuals if they're added individually as maintainers, not via teams.
-    userPings { inherit attrPath; } (package.meta.nonTeamMaintainers or [ ])
-    ++ lib.concatMap (teamPings { inherit attrPath; }) (package.meta.teams or [ ])
-  ) attrPathsToGetMaintainersFor;
-
-  changedFileEntities = lib.concatMap (
-    file:
-    userPings { inherit file; } (fileUsers.${file} or [ ])
-    ++ lib.concatMap (teamPings { inherit file; }) (fileTeams.${file} or [ ])
-  ) changedFiles;
+  attrsWithModifiedFiles = lib.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames;
 
   userPings =
-    context:
+    pkg:
     map (maintainer: {
       type = "user";
       userId = maintainer.githubId;
-      inherit context;
+      packageName = pkg.name;
     });
 
   teamPings =
-    context: team:
-    if team ? githubId then
+    pkg: team:
+    if team ? github then
       [
         {
           type = "team";
           teamId = team.githubId;
-          inherit context;
+          packageName = pkg.name;
         }
       ]
     else
-      userPings context team.members;
+      userPings pkg team.members;
 
-  byType = lib.groupBy (ping: ping.type) (attrPathEntities ++ changedFileEntities);
+  maintainersToPing = lib.concatMap (
+    pkg: userPings pkg pkg.users ++ lib.concatMap (teamPings pkg) pkg.teams
+  ) attrsWithModifiedFiles;
+
+  byType = lib.groupBy (ping: ping.type) maintainersToPing;
 
   byUser = lib.pipe (byType.user or [ ]) [
     (lib.groupBy (ping: toString ping.userId))
-    (lib.mapAttrs (_user: lib.map (pkg: pkg.context)))
+    (lib.mapAttrs (_user: lib.map (pkg: pkg.packageName)))
   ];
   byTeam = lib.pipe (byType.team or [ ]) [
     (lib.groupBy (ping: toString ping.teamId))
-    (lib.mapAttrs (_team: lib.map (pkg: pkg.context)))
+    (lib.mapAttrs (_team: lib.map (pkg: pkg.packageName)))
   ];
 in
 {
   users = byUser;
   teams = byTeam;
-  packages = attrPathsToGetMaintainersFor;
+  packages = lib.catAttrs "name" attrsWithModifiedFiles;
 }
diff --git a/ci/eval/compare/test.nix b/ci/eval/compare/test.nix
deleted file mode 100644
index 323d71d87680..000000000000
--- a/ci/eval/compare/test.nix
+++ /dev/null
@@ -1,228 +0,0 @@
-{
-  pkgs ? import ../../.. {
-    config = { };
-    overlays = [ ];
-  },
-  lib ? pkgs.lib,
-}:
-let
-  fun = import ./maintainers.nix;
-
-  mockPkgs =
-    {
-      packages ? [ ],
-      modules ? [ ],
-      githubTeams ? true,
-    }:
-    lib.updateManyAttrsByPath
-      (lib.imap0 (i: p: {
-        path = p;
-        update = _: {
-          meta.maintainersPosition.file = lib.concatStringsSep "/" p;
-          meta.nonTeamMaintainers = [ { githubId = i; } ];
-          meta.teams =
-            if githubTeams then [ { githubId = i + 100; } ] else [ { members = [ { githubId = i + 100; } ]; } ];
-        };
-      }) packages)
-      {
-        nixos =
-          { }:
-          {
-            config.meta.maintainers = lib.listToAttrs (
-              lib.imap0 (i: m: lib.nameValuePair m [ { githubId = i; } ]) modules
-            );
-            config.meta.teams = lib.listToAttrs (
-              lib.imap0 (
-                i: m:
-                lib.nameValuePair m (
-                  if githubTeams then [ { githubId = i + 100; } ] else [ { members = [ { githubId = i + 100; } ]; } ]
-                )
-              ) modules
-            );
-          };
-      };
-
-  tests = {
-    testEmpty = {
-      expr = fun {
-        pkgs = mockPkgs { };
-        inherit lib;
-        changedFiles = [ ];
-        affectedAttrPaths = [ ];
-      };
-      expected = {
-        packages = [ ];
-        teams = { };
-        users = { };
-      };
-    };
-    testNonExistentAffected = {
-      expr = fun {
-        pkgs = mockPkgs { };
-        inherit lib;
-        changedFiles = [ "a" ];
-        affectedAttrPaths = [ [ "b" ] ];
-      };
-      expected = {
-        packages = [ ];
-        teams = { };
-        users = { };
-      };
-    };
-    testIrrelevantAffected = {
-      expr = fun {
-        pkgs = mockPkgs {
-          packages = [ [ "b" ] ];
-        };
-        inherit lib;
-        changedFiles = [ "a" ];
-        affectedAttrPaths = [ [ "b" ] ];
-      };
-      expected = {
-        packages = [ ];
-        teams = { };
-        users = { };
-      };
-    };
-    testRelevantAffected = {
-      expr = fun {
-        pkgs = mockPkgs {
-          packages = [ [ "b" ] ];
-        };
-        inherit lib;
-        # Also tests that subpaths work
-        changedFiles = [ "b/c" ];
-        affectedAttrPaths = [ [ "b" ] ];
-      };
-      expected = {
-        packages = [ [ "b" ] ];
-        teams."100" = [
-          { attrPath = [ "b" ]; }
-        ];
-        users."0" = [
-          { attrPath = [ "b" ]; }
-        ];
-      };
-    };
-    testRelevantAffectedNonGitHub = {
-      expr = fun {
-        pkgs = mockPkgs {
-          packages = [ [ "b" ] ];
-          githubTeams = false;
-        };
-        inherit lib;
-        changedFiles = [ "b/c" ];
-        affectedAttrPaths = [ [ "b" ] ];
-      };
-      expected = {
-        packages = [ [ "b" ] ];
-        teams = { };
-        users."0" = [
-          { attrPath = [ "b" ]; }
-        ];
-        users."100" = [
-          { attrPath = [ "b" ]; }
-        ];
-      };
-    };
-    testByNameChanged = {
-      expr = fun {
-        pkgs = mockPkgs {
-          packages = [ [ "hello" ] ];
-        };
-        inherit lib;
-        changedFiles = [ "pkgs/by-name/he/hello/sources.json" ];
-        affectedAttrPaths = [ ];
-      };
-      expected = {
-        packages = [ [ "hello" ] ];
-        teams."100" = [
-          { attrPath = [ "hello" ]; }
-        ];
-        users."0" = [
-          { attrPath = [ "hello" ]; }
-        ];
-      };
-    };
-    testByNameReadmeChanged = {
-      expr = fun {
-        pkgs = mockPkgs {
-          packages = [ [ "hello" ] ];
-        };
-        inherit lib;
-        changedFiles = [ "pkgs/by-name/README.md" ];
-        affectedAttrPaths = [ ];
-      };
-      expected = {
-        packages = [ ];
-        teams = { };
-        users = { };
-      };
-    };
-    testNoDuplicates = {
-      expr = fun {
-        pkgs = mockPkgs {
-          packages = [ [ "hello" ] ];
-        };
-        inherit lib;
-        changedFiles = [
-          "hello"
-          "pkgs/by-name/he/hello/sources.json"
-        ];
-        affectedAttrPaths = [ [ "hello" ] ];
-      };
-      expected = {
-        packages = [ [ "hello" ] ];
-        teams."100" = [
-          { attrPath = [ "hello" ]; }
-        ];
-        users."0" = [
-          { attrPath = [ "hello" ]; }
-        ];
-      };
-    };
-    testModuleMaintainers = {
-      expr = fun {
-        pkgs = mockPkgs {
-          modules = [ "a" ];
-        };
-        inherit lib;
-        changedFiles = [ "a" ];
-        affectedAttrPaths = [ ];
-      };
-      expected = {
-        packages = [ ];
-        teams."100" = [
-          { file = "a"; }
-        ];
-        users."0" = [
-          { file = "a"; }
-        ];
-      };
-    };
-    testModuleMaintainersNonGithub = {
-      expr = fun {
-        pkgs = mockPkgs {
-          modules = [ "a" ];
-          githubTeams = false;
-        };
-        inherit lib;
-        changedFiles = [ "a" ];
-        affectedAttrPaths = [ ];
-      };
-      expected = {
-        packages = [ ];
-        teams = { };
-        users."100" = [
-          { file = "a"; }
-        ];
-        users."0" = [
-          { file = "a"; }
-        ];
-      };
-    };
-  };
-in
-{
-  result = lib.runTests tests;
-}
diff --git a/modules/generic/meta-maintainers.nix b/modules/generic/meta-maintainers.nix
index ce37dae03db6..f9e8a19aea82 100644
--- a/modules/generic/meta-maintainers.nix
+++ b/modules/generic/meta-maintainers.nix
@@ -4,12 +4,39 @@
 let
   inherit (lib)
     mkOption
+    mkOptionType
     types
     ;
 
-  # The resulting value of this type shows where all values were defined
-  sourceList = types.listOf types.raw // {
-    merge = loc: defs: lib.listToAttrs (lib.map ({ file, value }: lib.nameValuePair file value) defs);
+  maintainer = mkOptionType {
+    name = "maintainer";
+    check = email: lib.elem email (lib.attrValues lib.maintainers);
+    merge = loc: defs: {
+      # lib.last: Perhaps this could be merged instead, if "at most once per module"
+      # is a problem (see option description).
+      ${(lib.last defs).file} = (lib.last defs).value;
+    };
+  };
+
+  listOfMaintainers = types.listOf maintainer // {
+    merge =
+      loc: defs:
+      lib.zipAttrs (
+        lib.flatten (
+          lib.imap1 (
+            n: def:
+            lib.imap1 (
+              m: def':
+              maintainer.merge (loc ++ [ "[${toString n}-${toString m}]" ]) [
+                {
+                  inherit (def) file;
+                  value = def';
+                }
+              ]
+            ) def.value
+          ) defs
+        )
+      );
   };
 in
 {
@@ -17,14 +44,7 @@ in
   options = {
     meta = {
       maintainers = mkOption {
-        type =
-          let
-            allMaintainers = lib.attrValues lib.maintainers;
-          in
-          lib.types.addCheck sourceList (lib.all (v: lib.elem v allMaintainers))
-          // {
-            description = "list of lib.maintainers";
-          };
+        type = listOfMaintainers;
         default = [ ];
         example = lib.literalExpression "[ lib.maintainers.alice lib.maintainers.bob ]";
         description = ''
@@ -34,22 +54,6 @@ in
           The option value is not a list of maintainers, but an attribute set that maps module file names to lists of maintainers.
         '';
       };
-      teams = mkOption {
-        type =
-          let
-            allTeams = lib.attrValues lib.teams;
-          in
-          lib.types.addCheck sourceList (lib.all (v: lib.elem v allTeams))
-          // {
-            description = "list of lib.teams";
-          };
-        default = [ ];
-        example = lib.literalExpression "[ lib.teams.acme lib.teams.haskell ]";
-        description = ''
-          List of team maintainers of each module.
-          This option should be defined at most once per module.
-        '';
-      };
     };
   };
   meta.maintainers = with lib.maintainers; [
diff --git a/modules/generic/meta-maintainers/test.nix b/modules/generic/meta-maintainers/test.nix
index a9859a6ee2dc..e4b37780ca83 100644
--- a/modules/generic/meta-maintainers/test.nix
+++ b/modules/generic/meta-maintainers/test.nix
@@ -14,17 +14,9 @@ let
   };
 in
 rec {
-  # Inject ghost into lib.maintainers so it passes the addCheck validation
-  lib = (import ../../../lib).extend (
-    final: prev: {
-      maintainers = prev.maintainers // {
-        inherit ghost;
-      };
-    }
-  );
+  lib = import ../../../lib;
 
   example = lib.evalModules {
-    specialArgs.lib = lib;
     modules = [
       ../meta-maintainers.nix
       {
diff --git a/nixos/modules/config/vte.nix b/nixos/modules/config/vte.nix
index f3ec58012b0d..8ed746d4966d 100644
--- a/nixos/modules/config/vte.nix
+++ b/nixos/modules/config/vte.nix
@@ -22,7 +22,7 @@ in
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/config/xdg/autostart.nix b/nixos/modules/config/xdg/autostart.nix
index 8310c377d43b..8fc3cb9920fa 100644
--- a/nixos/modules/config/xdg/autostart.nix
+++ b/nixos/modules/config/xdg/autostart.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members;
   };
 
   options = {
diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix
index 41eee42767f4..7810c57ef386 100644
--- a/nixos/modules/config/xdg/icons.nix
+++ b/nixos/modules/config/xdg/icons.nix
@@ -6,7 +6,7 @@
 }:
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members;
   };
 
   options = {
diff --git a/nixos/modules/config/xdg/menus.nix b/nixos/modules/config/xdg/menus.nix
index efbfdc5f2383..6c05d49189ad 100644
--- a/nixos/modules/config/xdg/menus.nix
+++ b/nixos/modules/config/xdg/menus.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members;
   };
 
   options = {
diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix
index 59d62a32010b..79955a03ef2f 100644
--- a/nixos/modules/config/xdg/mime.nix
+++ b/nixos/modules/config/xdg/mime.nix
@@ -13,7 +13,7 @@ in
 
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members ++ [ ];
   };
 
   options = {
diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix
index 6bc6ce5e33e7..5fd9d7fdd1bb 100644
--- a/nixos/modules/config/xdg/portal.nix
+++ b/nixos/modules/config/xdg/portal.nix
@@ -32,7 +32,7 @@ in
   ];
 
   meta = {
-    teams = [ teams.freedesktop ];
+    maintainers = teams.freedesktop.members;
   };
 
   options.xdg.portal = {
diff --git a/nixos/modules/config/xdg/portals/lxqt.nix b/nixos/modules/config/xdg/portals/lxqt.nix
index 423fcae1b2b1..77a5f144730d 100644
--- a/nixos/modules/config/xdg/portals/lxqt.nix
+++ b/nixos/modules/config/xdg/portals/lxqt.nix
@@ -10,7 +10,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.lxqt ];
+    maintainers = lib.teams.lxqt.members;
   };
 
   options.xdg.portal.lxqt = {
diff --git a/nixos/modules/config/xdg/sounds.nix b/nixos/modules/config/xdg/sounds.nix
index e23ced7f76dd..8b5bb67e4109 100644
--- a/nixos/modules/config/xdg/sounds.nix
+++ b/nixos/modules/config/xdg/sounds.nix
@@ -6,7 +6,7 @@
 }:
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members;
   };
 
   options = {
diff --git a/nixos/modules/programs/dsearch.nix b/nixos/modules/programs/dsearch.nix
index 5e99478054d3..f1597189fa38 100644
--- a/nixos/modules/programs/dsearch.nix
+++ b/nixos/modules/programs/dsearch.nix
@@ -49,5 +49,5 @@ in
     systemd.user.services.dsearch.wantedBy = mkIf cfg.systemd.enable [ cfg.systemd.target ];
   };
 
-  meta.teams = [ lib.teams.danklinux ];
+  meta.maintainers = lib.teams.danklinux.members;
 }
diff --git a/nixos/modules/programs/geary.nix b/nixos/modules/programs/geary.nix
index 6c881dc8ccaf..0cbfe5b0605c 100644
--- a/nixos/modules/programs/geary.nix
+++ b/nixos/modules/programs/geary.nix
@@ -11,7 +11,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/programs/gnome-disks.nix b/nixos/modules/programs/gnome-disks.nix
index c6de53d844f3..e6f93c6fdfe6 100644
--- a/nixos/modules/programs/gnome-disks.nix
+++ b/nixos/modules/programs/gnome-disks.nix
@@ -10,7 +10,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/programs/gnome-terminal.nix b/nixos/modules/programs/gnome-terminal.nix
index f7ade6a184c4..aea0e97c3634 100644
--- a/nixos/modules/programs/gnome-terminal.nix
+++ b/nixos/modules/programs/gnome-terminal.nix
@@ -16,7 +16,7 @@ in
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/programs/nm-applet.nix b/nixos/modules/programs/nm-applet.nix
index a1c69f52f624..7aecbadd2ebf 100644
--- a/nixos/modules/programs/nm-applet.nix
+++ b/nixos/modules/programs/nm-applet.nix
@@ -10,7 +10,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members;
   };
 
   options.programs.nm-applet = {
diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
index 2ae30243c432..6fa66f681457 100644
--- a/nixos/modules/programs/steam.nix
+++ b/nixos/modules/programs/steam.nix
@@ -285,5 +285,5 @@ in
     ];
   };
 
-  meta.teams = [ lib.teams.steam ];
+  meta.maintainers = lib.teams.steam.members;
 }
diff --git a/nixos/modules/programs/thunar.nix b/nixos/modules/programs/thunar.nix
index c565f3ef1cec..76da7d94c67c 100644
--- a/nixos/modules/programs/thunar.nix
+++ b/nixos/modules/programs/thunar.nix
@@ -11,7 +11,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.xfce ];
+    maintainers = lib.teams.xfce.members;
   };
 
   options = {
diff --git a/nixos/modules/programs/wayland/dms-shell.nix b/nixos/modules/programs/wayland/dms-shell.nix
index b24253b57c23..53f84c1a41b1 100644
--- a/nixos/modules/programs/wayland/dms-shell.nix
+++ b/nixos/modules/programs/wayland/dms-shell.nix
@@ -226,5 +226,5 @@ in
     hardware.graphics.enable = lib.mkDefault true;
   };
 
-  meta.teams = [ lib.teams.danklinux ];
+  meta.maintainers = lib.teams.danklinux.members;
 }
diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix
index 744f7af70fe5..44aedc3d248e 100644
--- a/nixos/modules/programs/wayland/hyprland.nix
+++ b/nixos/modules/programs/wayland/hyprland.nix
@@ -130,5 +130,5 @@ in
     ] "Nvidia patches are no longer needed")
   ];
 
-  meta.teams = [ lib.teams.hyprland ];
+  meta.maintainers = lib.teams.hyprland.members;
 }
diff --git a/nixos/modules/programs/wayland/hyprlock.nix b/nixos/modules/programs/wayland/hyprlock.nix
index c1ba14ddf771..e05d8f826a4c 100644
--- a/nixos/modules/programs/wayland/hyprlock.nix
+++ b/nixos/modules/programs/wayland/hyprlock.nix
@@ -26,5 +26,5 @@ in
     security.pam.services.hyprlock = { };
   };
 
-  meta.teams = [ lib.teams.hyprland ];
+  meta.maintainers = lib.teams.hyprland.members;
 }
diff --git a/nixos/modules/programs/xfconf.nix b/nixos/modules/programs/xfconf.nix
index 74a05cc1a798..cc9b6ddf7ac7 100644
--- a/nixos/modules/programs/xfconf.nix
+++ b/nixos/modules/programs/xfconf.nix
@@ -11,7 +11,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.xfce ];
+    maintainers = lib.teams.xfce.members;
   };
 
   options = {
diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix
index cb3a0010a758..1b262e285e19 100644
--- a/nixos/modules/security/acme/default.nix
+++ b/nixos/modules/security/acme/default.nix
@@ -1218,7 +1218,7 @@ in
   ];
 
   meta = {
-    teams = [ lib.teams.acme ];
+    maintainers = lib.teams.acme.members;
     doc = ./default.md;
   };
 }
diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index d446bb37a722..6b059c2bd522 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -272,5 +272,5 @@ in
     };
   };
 
-  meta.teams = [ lib.teams.apparmor ];
+  meta.maintainers = lib.teams.apparmor.members;
 }
diff --git a/nixos/modules/services/cluster/rancher/default.nix b/nixos/modules/services/cluster/rancher/default.nix
index c511da5a62f5..3ed0f75d081e 100644
--- a/nixos/modules/services/cluster/rancher/default.nix
+++ b/nixos/modules/services/cluster/rancher/default.nix
@@ -962,6 +962,5 @@ in
       (import ./rke2.nix args)
     ];
 
-  meta.teams = [ lib.teams.k3s ];
-  meta.maintainers = pkgs.rke2.meta.maintainers;
+  meta.maintainers = pkgs.rke2.meta.maintainers ++ lib.teams.k3s.members;
 }
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index 1cf585604b5e..42e88e9ddbe3 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -313,5 +313,5 @@ in
     '')
   ];
 
-  meta.teams = [ lib.teams.buildbot ];
+  meta.maintainers = lib.teams.buildbot.members;
 }
diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix
index c16720b0bf67..b1e1e7e254b5 100644
--- a/nixos/modules/services/continuous-integration/buildbot/worker.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix
@@ -196,6 +196,6 @@ in
     };
   };
 
-  meta.teams = [ lib.teams.buildbot ];
+  meta.maintainers = lib.teams.buildbot.members;
 
 }
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix
index 693229b87d97..b95d30ceea4a 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix
@@ -893,5 +893,5 @@ in
     )
   ];
 
-  meta.teams = [ teams.gitlab ];
+  meta.maintainers = teams.gitlab.members;
 }
diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix
index 50c291a10be6..de9371de513a 100644
--- a/nixos/modules/services/databases/clickhouse.nix
+++ b/nixos/modules/services/databases/clickhouse.nix
@@ -13,7 +13,7 @@ let
 in
 {
 
-  meta.maintainers = with lib.maintainers; [ thevar1able ];
+  meta.maintainers = [ "thevar1able" ];
 
   ###### interface
 
diff --git a/nixos/modules/services/desktop-managers/budgie.nix b/nixos/modules/services/desktop-managers/budgie.nix
index 36f2946970bd..160ac04ecd6d 100644
--- a/nixos/modules/services/desktop-managers/budgie.nix
+++ b/nixos/modules/services/desktop-managers/budgie.nix
@@ -61,7 +61,7 @@ let
   notExcluded = pkg: utils.disablePackageByName pkg config.environment.budgie.excludePackages;
 in
 {
-  meta.teams = [ lib.teams.budgie ];
+  meta.maintainers = lib.teams.budgie.members;
 
   imports = [
     (lib.mkRenamedOptionModule
diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix
index c780a5164922..26b185cc7742 100644
--- a/nixos/modules/services/desktop-managers/cosmic.nix
+++ b/nixos/modules/services/desktop-managers/cosmic.nix
@@ -44,7 +44,7 @@ let
     ];
 in
 {
-  meta.teams = [ lib.teams.cosmic ];
+  meta.maintainers = lib.teams.cosmic.members;
 
   options = {
     services.desktopManager.cosmic = {
diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix
index ddd13354612e..5c11388eb97b 100644
--- a/nixos/modules/services/desktop-managers/gnome.nix
+++ b/nixos/modules/services/desktop-managers/gnome.nix
@@ -82,7 +82,7 @@ in
 {
   meta = {
     doc = ./gnome.md;
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   imports = [
diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix
index 1f40afb3732a..b82c194be92c 100644
--- a/nixos/modules/services/desktop-managers/lomiri.nix
+++ b/nixos/modules/services/desktop-managers/lomiri.nix
@@ -292,5 +292,5 @@ in
     })
   ];
 
-  meta.teams = [ lib.teams.lomiri ];
+  meta.maintainers = lib.teams.lomiri.members;
 }
diff --git a/nixos/modules/services/desktop-managers/pantheon.nix b/nixos/modules/services/desktop-managers/pantheon.nix
index b9498a0adb83..1fe99c0f66ac 100644
--- a/nixos/modules/services/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/desktop-managers/pantheon.nix
@@ -25,7 +25,7 @@ in
 
   meta = {
     doc = ./pantheon.md;
-    teams = [ teams.pantheon ];
+    maintainers = teams.pantheon.members;
   };
 
   imports = [
diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix
index fd328e357ce2..758f7383ca63 100644
--- a/nixos/modules/services/desktops/accountsservice.nix
+++ b/nixos/modules/services/desktops/accountsservice.nix
@@ -7,7 +7,7 @@
 }:
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index e44816cf2542..ffc48d6b9435 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -373,6 +373,6 @@ in
   };
 
   meta = {
-    teams = [ lib.teams.pantheon ];
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 }
diff --git a/nixos/modules/services/desktops/gnome/at-spi2-core.nix b/nixos/modules/services/desktops/gnome/at-spi2-core.nix
index 77070843e04e..293a3166b187 100644
--- a/nixos/modules/services/desktops/gnome/at-spi2-core.nix
+++ b/nixos/modules/services/desktops/gnome/at-spi2-core.nix
@@ -10,7 +10,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/evolution-data-server.nix b/nixos/modules/services/desktops/gnome/evolution-data-server.nix
index 4437be835604..539fcf25342e 100644
--- a/nixos/modules/services/desktops/gnome/evolution-data-server.nix
+++ b/nixos/modules/services/desktops/gnome/evolution-data-server.nix
@@ -10,7 +10,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix b/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix
index eb1bad3b15c4..d88f1a618049 100644
--- a/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix
+++ b/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix
@@ -13,7 +13,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/services/desktops/gnome/glib-networking.nix b/nixos/modules/services/desktops/gnome/glib-networking.nix
index 048db8cf54a3..558abca0aa31 100644
--- a/nixos/modules/services/desktops/gnome/glib-networking.nix
+++ b/nixos/modules/services/desktops/gnome/glib-networking.nix
@@ -10,7 +10,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix
index 17c1dd9045e8..335ebc9a144d 100644
--- a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix
@@ -16,7 +16,7 @@ in
 
 {
   meta = {
-    teams = [ teams.gnome ];
+    maintainers = teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
index e72574795e65..3df01b59738d 100644
--- a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
@@ -48,7 +48,7 @@ in
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/gnome-keyring.nix b/nixos/modules/services/desktops/gnome/gnome-keyring.nix
index 9140d261a770..550c6ba8eff5 100644
--- a/nixos/modules/services/desktops/gnome/gnome-keyring.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-keyring.nix
@@ -12,7 +12,7 @@ in
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix
index 7ec9c7e06296..920c4cf8133e 100644
--- a/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix
@@ -10,7 +10,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
index 958fbb546dc3..6e685557ecf0 100644
--- a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
@@ -8,7 +8,7 @@
 
 {
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix
index 7d6f7f7f3478..06d001ab8134 100644
--- a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix
@@ -16,7 +16,7 @@ in
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/gnome-software.nix b/nixos/modules/services/desktops/gnome/gnome-software.nix
index 6bbe4d5487ab..ced2549a9e21 100644
--- a/nixos/modules/services/desktops/gnome/gnome-software.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-software.nix
@@ -7,7 +7,7 @@
 
 {
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/services/desktops/gnome/gnome-user-share.nix b/nixos/modules/services/desktops/gnome/gnome-user-share.nix
index eb869106c818..c6d0f723c047 100644
--- a/nixos/modules/services/desktops/gnome/gnome-user-share.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-user-share.nix
@@ -10,7 +10,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/localsearch.nix b/nixos/modules/services/desktops/gnome/localsearch.nix
index 90018c557ec1..9160d1f06431 100644
--- a/nixos/modules/services/desktops/gnome/localsearch.nix
+++ b/nixos/modules/services/desktops/gnome/localsearch.nix
@@ -7,7 +7,7 @@
 
 {
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   imports = [
diff --git a/nixos/modules/services/desktops/gnome/rygel.nix b/nixos/modules/services/desktops/gnome/rygel.nix
index 410550b8990c..e8a147ed6e76 100644
--- a/nixos/modules/services/desktops/gnome/rygel.nix
+++ b/nixos/modules/services/desktops/gnome/rygel.nix
@@ -14,7 +14,7 @@ in
 
 {
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/sushi.nix b/nixos/modules/services/desktops/gnome/sushi.nix
index d8aff2a7a0bd..ea99c7ce30f0 100644
--- a/nixos/modules/services/desktops/gnome/sushi.nix
+++ b/nixos/modules/services/desktops/gnome/sushi.nix
@@ -10,7 +10,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/tinysparql.nix b/nixos/modules/services/desktops/gnome/tinysparql.nix
index 3811780ddbc4..551b5800e84c 100644
--- a/nixos/modules/services/desktops/gnome/tinysparql.nix
+++ b/nixos/modules/services/desktops/gnome/tinysparql.nix
@@ -10,7 +10,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   imports = [
diff --git a/nixos/modules/services/desktops/gvfs.nix b/nixos/modules/services/desktops/gvfs.nix
index 004810327798..315141705546 100644
--- a/nixos/modules/services/desktops/gvfs.nix
+++ b/nixos/modules/services/desktops/gvfs.nix
@@ -16,7 +16,7 @@ in
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix
index 77cdfa9a573e..3f4cf2af05b2 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire.nix
@@ -85,8 +85,7 @@ let
   };
 in
 {
-  meta.teams = [ teams.freedesktop ];
-  meta.maintainers = [ maintainers.k900 ];
+  meta.maintainers = teams.freedesktop.members ++ [ maintainers.k900 ];
 
   ###### interface
   options = {
diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix
index 9143466fafef..12b0184d42c9 100644
--- a/nixos/modules/services/desktops/tumbler.nix
+++ b/nixos/modules/services/desktops/tumbler.nix
@@ -18,7 +18,7 @@ in
   ];
 
   meta = {
-    teams = [ lib.teams.pantheon ];
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/zeitgeist.nix b/nixos/modules/services/desktops/zeitgeist.nix
index fe065c4a4d7a..227287dd2377 100644
--- a/nixos/modules/services/desktops/zeitgeist.nix
+++ b/nixos/modules/services/desktops/zeitgeist.nix
@@ -8,7 +8,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.pantheon ];
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/display-managers/cosmic-greeter.nix b/nixos/modules/services/display-managers/cosmic-greeter.nix
index 93320b9be90a..8886a4766e4e 100644
--- a/nixos/modules/services/display-managers/cosmic-greeter.nix
+++ b/nixos/modules/services/display-managers/cosmic-greeter.nix
@@ -16,7 +16,7 @@ let
 in
 
 {
-  meta.teams = [ lib.teams.cosmic ];
+  meta.maintainers = lib.teams.cosmic.members;
 
   options.services.displayManager.cosmic-greeter = {
     enable = lib.mkEnableOption "COSMIC greeter";
diff --git a/nixos/modules/services/display-managers/dms-greeter.nix b/nixos/modules/services/display-managers/dms-greeter.nix
index abdd6e2ddf3b..d049daa9b24f 100644
--- a/nixos/modules/services/display-managers/dms-greeter.nix
+++ b/nixos/modules/services/display-managers/dms-greeter.nix
@@ -321,5 +321,5 @@ in
     services.libinput.enable = mkDefault true;
   };
 
-  meta.teams = [ lib.teams.danklinux ];
+  meta.maintainers = lib.teams.danklinux.members;
 }
diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix
index 9fc92e91018c..e46c8cf72fe7 100644
--- a/nixos/modules/services/display-managers/gdm.nix
+++ b/nixos/modules/services/display-managers/gdm.nix
@@ -105,7 +105,7 @@ in
   ];
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix
index eb4b475d4187..dc1900f52c1e 100644
--- a/nixos/modules/services/home-automation/home-assistant.nix
+++ b/nixos/modules/services/home-automation/home-assistant.nix
@@ -171,7 +171,7 @@ in
 
   meta = {
     buildDocsInSandbox = false;
-    teams = [ lib.teams.home-assistant ];
+    maintainers = lib.teams.home-assistant.members;
   };
 
   options.services.home-assistant = {
diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix
index 302bd42b5e37..2c31266457df 100644
--- a/nixos/modules/services/matrix/dendrite.nix
+++ b/nixos/modules/services/matrix/dendrite.nix
@@ -341,5 +341,5 @@ in
       };
     };
   };
-  meta.teams = [ lib.teams.matrix ];
+  meta.maintainers = lib.teams.matrix.members;
 }
diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix
index 6834ca2008ea..9b85fc8dc133 100644
--- a/nixos/modules/services/misc/forgejo.nix
+++ b/nixos/modules/services/misc/forgejo.nix
@@ -849,5 +849,5 @@ in
   };
 
   meta.doc = ./forgejo.md;
-  meta.teams = [ lib.teams.forgejo ];
+  meta.maintainers = lib.teams.forgejo.members;
 }
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 0601454e9b2e..c353caed9e03 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -1911,5 +1911,5 @@ in
   };
 
   meta.doc = ./gitlab.md;
-  meta.teams = [ teams.gitlab ];
+  meta.maintainers = teams.gitlab.members;
 }
diff --git a/nixos/modules/services/networking/epmd.nix b/nixos/modules/services/networking/epmd.nix
index d2aceb5a9bb1..c17a7c974fa7 100644
--- a/nixos/modules/services/networking/epmd.nix
+++ b/nixos/modules/services/networking/epmd.nix
@@ -63,5 +63,5 @@ in
     };
   };
 
-  meta.teams = [ lib.teams.beam ];
+  meta.maintainers = lib.teams.beam.members;
 }
diff --git a/nixos/modules/services/networking/jibri/default.nix b/nixos/modules/services/networking/jibri/default.nix
index 861a6713b017..e07bf5131a92 100644
--- a/nixos/modules/services/networking/jibri/default.nix
+++ b/nixos/modules/services/networking/jibri/default.nix
@@ -444,5 +444,5 @@ in
     };
   };
 
-  meta.teams = [ lib.teams.jitsi ];
+  meta.maintainers = lib.teams.jitsi.members;
 }
diff --git a/nixos/modules/services/networking/jicofo.nix b/nixos/modules/services/networking/jicofo.nix
index 9c2139eff1ab..9d0fbfd74081 100644
--- a/nixos/modules/services/networking/jicofo.nix
+++ b/nixos/modules/services/networking/jicofo.nix
@@ -166,5 +166,5 @@ in
       lib.mkDefault "${pkgs.jicofo}/etc/jitsi/jicofo/logging.properties-journal";
   };
 
-  meta.teams = [ lib.teams.jitsi ];
+  meta.maintainers = lib.teams.jitsi.members;
 }
diff --git a/nixos/modules/services/networking/jigasi.nix b/nixos/modules/services/networking/jigasi.nix
index c6bcbd28dead..54b2f36685f6 100644
--- a/nixos/modules/services/networking/jigasi.nix
+++ b/nixos/modules/services/networking/jigasi.nix
@@ -243,5 +243,5 @@ in
       lib.mkDefault "${stateDir}/logging.properties-journal";
   };
 
-  meta.teams = [ lib.teams.jitsi ];
+  meta.maintainers = lib.teams.jitsi.members;
 }
diff --git a/nixos/modules/services/networking/jitsi-videobridge.nix b/nixos/modules/services/networking/jitsi-videobridge.nix
index bd9692e6338a..a55760d5cae2 100644
--- a/nixos/modules/services/networking/jitsi-videobridge.nix
+++ b/nixos/modules/services/networking/jitsi-videobridge.nix
@@ -331,5 +331,5 @@ in
     ];
   };
 
-  meta.teams = [ lib.teams.jitsi ];
+  meta.maintainers = lib.teams.jitsi.members;
 }
diff --git a/nixos/modules/services/networking/modemmanager.nix b/nixos/modules/services/networking/modemmanager.nix
index 604340fd0748..fefee7a448eb 100644
--- a/nixos/modules/services/networking/modemmanager.nix
+++ b/nixos/modules/services/networking/modemmanager.nix
@@ -9,7 +9,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members;
   };
 
   options = with lib; {
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 2cb3532471c8..1f3773c70b00 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -142,8 +142,9 @@ in
 {
 
   meta = {
-    teams = [ lib.teams.freedesktop ];
-    maintainers = [ lib.maintainers.frontear ];
+    maintainers = teams.freedesktop.members ++ [
+      lib.maintainers.frontear
+    ];
   };
 
   ###### interface
diff --git a/nixos/modules/services/security/reaction.nix b/nixos/modules/services/security/reaction.nix
index ba0cc6581dbc..039e507ae57f 100644
--- a/nixos/modules/services/security/reaction.nix
+++ b/nixos/modules/services/security/reaction.nix
@@ -299,8 +299,10 @@ in
       environment.systemPackages = [ cfg.package ];
     };
 
-  meta.teams = [ lib.teams.ngi ];
-  meta.maintainers = with lib.maintainers; [
-    ppom
-  ];
+  meta.maintainers =
+    with lib.maintainers;
+    [
+      ppom
+    ]
+    ++ lib.teams.ngi.members;
 }
diff --git a/nixos/modules/services/wayland/hypridle.nix b/nixos/modules/services/wayland/hypridle.nix
index 29e77c6be34f..4ccb126b56f2 100644
--- a/nixos/modules/services/wayland/hypridle.nix
+++ b/nixos/modules/services/wayland/hypridle.nix
@@ -28,5 +28,5 @@ in
     };
   };
 
-  meta.teams = [ lib.teams.hyprland ];
+  meta.maintainers = lib.teams.hyprland.members;
 }
diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix
index 18da068fa5c6..b7993cfc46dc 100644
--- a/nixos/modules/services/web-apps/jitsi-meet.nix
+++ b/nixos/modules/services/web-apps/jitsi-meet.nix
@@ -756,5 +756,5 @@ in
   };
 
   meta.doc = ./jitsi-meet.md;
-  meta.teams = [ lib.teams.jitsi ];
+  meta.maintainers = lib.teams.jitsi.members;
 }
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index d069480f3d70..cff0f6ff1872 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -1774,5 +1774,5 @@ in
   );
 
   meta.doc = ./nextcloud.md;
-  meta.teams = [ lib.teams.nextcloud ];
+  meta.maintainers = lib.teams.nextcloud.members;
 }
diff --git a/nixos/modules/services/web-apps/peertube-runner.nix b/nixos/modules/services/web-apps/peertube-runner.nix
index 4756569d9d9c..9b126b7fa97c 100644
--- a/nixos/modules/services/web-apps/peertube-runner.nix
+++ b/nixos/modules/services/web-apps/peertube-runner.nix
@@ -252,5 +252,5 @@ in
     };
   };
 
-  meta.teams = [ lib.teams.ngi ];
+  meta.maintainers = lib.teams.ngi.members;
 }
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index df132f95e95c..bc5c2b0273e7 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -25,7 +25,7 @@ in
 
 {
   meta = {
-    teams = [ teams.enlightenment ];
+    maintainers = teams.enlightenment.members;
   };
 
   imports = [
diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix
index a0cd79f7aae7..74fabced3af3 100644
--- a/nixos/modules/services/x11/desktop-managers/lumina.nix
+++ b/nixos/modules/services/x11/desktop-managers/lumina.nix
@@ -16,7 +16,7 @@ in
 
 {
   meta = {
-    teams = [ teams.lumina ];
+    maintainers = teams.lumina.members;
   };
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index 8948eff23d46..1ccaa28f8642 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -15,7 +15,7 @@ in
 
 {
   meta = {
-    teams = [ teams.lxqt ];
+    maintainers = teams.lxqt.members;
   };
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 2d53eb58f287..55da49799e31 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -15,7 +15,7 @@ let
 in
 {
   meta = {
-    teams = [ teams.xfce ];
+    maintainers = teams.xfce.members;
   };
 
   imports = [
diff --git a/nixos/modules/services/x11/display-managers/account-service-util.nix b/nixos/modules/services/x11/display-managers/account-service-util.nix
index 697d5b9e940d..0f4d1c0729ad 100644
--- a/nixos/modules/services/x11/display-managers/account-service-util.nix
+++ b/nixos/modules/services/x11/display-managers/account-service-util.nix
@@ -40,6 +40,6 @@ python3.pkgs.buildPythonApplication {
   '';
 
   meta = {
-    teams = [ lib.teams.pantheon ];
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 }
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix
index d8db7706d89f..387f485e2fea 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix
@@ -13,7 +13,7 @@ let
 
 in
 {
-  meta.teams = [ lib.teams.lomiri ];
+  meta.maintainers = lib.teams.lomiri.members;
 
   options = {
     services.xserver.displayManager.lightdm.greeters.lomiri = {
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
index 3c61ba1556c8..05e03befdad6 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
@@ -16,7 +16,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.pantheon ];
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 
   options = {
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 467207ecd92b..1ace9c1b8c1f 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -73,7 +73,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.pantheon ];
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 
   # Note: the order in which lightdm greeter modules are imported
diff --git a/nixos/modules/services/x11/touchegg.nix b/nixos/modules/services/x11/touchegg.nix
index cb1b9eb4adc8..def3dac738e0 100644
--- a/nixos/modules/services/x11/touchegg.nix
+++ b/nixos/modules/services/x11/touchegg.nix
@@ -13,7 +13,7 @@ let
 in
 {
   meta = {
-    teams = [ teams.pantheon ];
+    maintainers = teams.pantheon.members;
   };
 
   ###### interface
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 6386a57079f2..a0c7e826223d 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -13,7 +13,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.podman ];
+    maintainers = [ ] ++ lib.teams.podman.members;
   };
 
   options.virtualisation.containers = {
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
index 68cfc2ccaad9..ddaccf8199a1 100644
--- a/nixos/modules/virtualisation/cri-o.nix
+++ b/nixos/modules/virtualisation/cri-o.nix
@@ -21,7 +21,7 @@ let
 in
 {
   meta = {
-    teams = [ teams.podman ];
+    maintainers = teams.podman.members;
   };
 
   options.virtualisation.cri-o = {
diff --git a/nixos/modules/virtualisation/incus-agent.nix b/nixos/modules/virtualisation/incus-agent.nix
index 34c08e8ee014..bfb9eeb75d33 100644
--- a/nixos/modules/virtualisation/incus-agent.nix
+++ b/nixos/modules/virtualisation/incus-agent.nix
@@ -10,7 +10,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   options = {
diff --git a/nixos/modules/virtualisation/incus-virtual-machine.nix b/nixos/modules/virtualisation/incus-virtual-machine.nix
index d714b7fdc36c..8899fc34bb85 100644
--- a/nixos/modules/virtualisation/incus-virtual-machine.nix
+++ b/nixos/modules/virtualisation/incus-virtual-machine.nix
@@ -10,7 +10,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   imports = [
diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
index 1b8908d0d3d6..7101407fb5bc 100644
--- a/nixos/modules/virtualisation/incus.nix
+++ b/nixos/modules/virtualisation/incus.nix
@@ -176,7 +176,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   options = {
diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix
index ec206d6a5ece..a6964b8b2c9a 100644
--- a/nixos/modules/virtualisation/lxc-container.nix
+++ b/nixos/modules/virtualisation/lxc-container.nix
@@ -7,7 +7,7 @@
 
 {
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   imports = [
diff --git a/nixos/modules/virtualisation/lxc-image-metadata.nix b/nixos/modules/virtualisation/lxc-image-metadata.nix
index 1ac1bd2e4e5e..d27f476a59b8 100644
--- a/nixos/modules/virtualisation/lxc-image-metadata.nix
+++ b/nixos/modules/virtualisation/lxc-image-metadata.nix
@@ -71,7 +71,7 @@ in
   ];
 
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   options = {
diff --git a/nixos/modules/virtualisation/lxc-instance-common.nix b/nixos/modules/virtualisation/lxc-instance-common.nix
index d3056be46fe3..ff27b1931f8b 100644
--- a/nixos/modules/virtualisation/lxc-instance-common.nix
+++ b/nixos/modules/virtualisation/lxc-instance-common.nix
@@ -2,7 +2,7 @@
 
 {
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   imports = [
diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix
index eca2eb8115ab..903006a6dabf 100644
--- a/nixos/modules/virtualisation/lxc.nix
+++ b/nixos/modules/virtualisation/lxc.nix
@@ -13,7 +13,7 @@ in
 
 {
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   options.virtualisation.lxc = {
diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix
index 711bcf655d22..f7347af19148 100644
--- a/nixos/modules/virtualisation/lxcfs.nix
+++ b/nixos/modules/virtualisation/lxcfs.nix
@@ -12,7 +12,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   ###### interface
diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix
index c0acbe4cac3d..63cc4c5e3f63 100644
--- a/nixos/modules/virtualisation/podman/default.nix
+++ b/nixos/modules/virtualisation/podman/default.nix
@@ -63,7 +63,7 @@ in
   ];
 
   meta = {
-    teams = [ lib.teams.podman ];
+    maintainers = lib.teams.podman.members;
   };
 
   options.virtualisation.podman = {
diff --git a/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix b/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix
index 962ca39b1598..d5b4bef5f0d9 100644
--- a/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix
+++ b/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix
@@ -35,6 +35,5 @@ in
 
   };
 
-  meta.teams = [ lib.teams.podman ];
-  meta.maintainers = [ lib.maintainers.roberth ];
+  meta.maintainers = lib.teams.podman.members ++ [ lib.maintainers.roberth ];
 }
diff --git a/nixos/modules/virtualisation/podman/network-socket.nix b/nixos/modules/virtualisation/podman/network-socket.nix
index d3a49d204f8a..39434216d780 100644
--- a/nixos/modules/virtualisation/podman/network-socket.nix
+++ b/nixos/modules/virtualisation/podman/network-socket.nix
@@ -95,6 +95,5 @@ in
     networking.firewall.allowedTCPPorts = lib.optional (cfg.enable && cfg.openFirewall) cfg.port;
   };
 
-  meta.teams = [ lib.teams.podman ];
-  meta.maintainers = [ lib.maintainers.roberth ];
+  meta.maintainers = lib.teams.podman.members ++ [ lib.maintainers.roberth ];
 }
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 2cc939631f84..bbd6bfb57751 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -937,6 +937,6 @@ in
   };
   meta = {
     doc = ./xen.md;
-    teams = [ teams.xen ];
+    maintainers = teams.xen.members;
   };
 }