diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 565dd0b5eb88..fe3429f2c2d7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -29003,4 +29003,3 @@
   };
   # keep-sorted end
 }
-# Keep the list alphabetically sorted.
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index efa4fc1c05d7..71d2b62c55cd 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -31,6 +31,7 @@
 { lib }:
 with lib.maintainers;
 {
+  # keep-sorted start case=no numeric=no block=yes newline_separated=yes
   acme = {
     members = [
       aanderse
@@ -258,6 +259,15 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  cosmopolitan = {
+    members = [
+      bbjubjub
+      tomberek
+    ];
+    scope = "Maintain the Cosmopolitan LibC and related programs.";
+    shortName = "Cosmopolitan";
+  };
+
   cuda = {
     members = [
       connorbaker
@@ -293,29 +303,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  cosmopolitan = {
-    members = [
-      bbjubjub
-      tomberek
-    ];
-    scope = "Maintain the Cosmopolitan LibC and related programs.";
-    shortName = "Cosmopolitan";
-  };
-
-  dotnet = {
-    members = [
-      mdarocha
-      corngood
-      ggg
-      raphaelr
-      jamiemagee
-      anpin
-      meenzen
-    ];
-    scope = "Maintainers of the .NET build tools and packages";
-    shortName = "dotnet";
-  };
-
   deepin = {
     members = [ wineee ];
     scope = "Maintain deepin desktop environment and related packages.";
@@ -370,6 +357,20 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  dotnet = {
+    members = [
+      mdarocha
+      corngood
+      ggg
+      raphaelr
+      jamiemagee
+      anpin
+      meenzen
+    ];
+    scope = "Maintainers of the .NET build tools and packages";
+    shortName = "dotnet";
+  };
+
   emacs = {
     members = [
       AndersonTorres
@@ -497,21 +498,6 @@ with lib.maintainers;
     shortName = "gitlab";
   };
 
-  golang = {
-    members = [
-      kalbasit
-      katexochen
-      mic92
-      zowoq
-      qbit
-      mfrw
-    ];
-    githubTeams = [ "golang" ];
-    scope = "Maintain Golang compilers.";
-    shortName = "Go";
-    enableFeatureFreezePing = true;
-  };
-
   gnome = {
     members = [
       bobby285271
@@ -535,6 +521,21 @@ with lib.maintainers;
     shortName = "GNOME Circle";
   };
 
+  golang = {
+    members = [
+      kalbasit
+      katexochen
+      mic92
+      zowoq
+      qbit
+      mfrw
+    ];
+    githubTeams = [ "golang" ];
+    scope = "Maintain Golang compilers.";
+    shortName = "Go";
+    enableFeatureFreezePing = true;
+  };
+
   graalvm-ce = {
     members = [
       bandresen
@@ -672,17 +673,6 @@ with lib.maintainers;
     shortName = "K3s";
   };
 
-  kubernetes = {
-    members = [
-      johanot
-      offline
-      saschagrunert
-      srhb
-    ];
-    scope = "Maintain the Kubernetes package and module";
-    shortName = "Kubernetes";
-  };
-
   kodi = {
     members = [
       aanderse
@@ -697,6 +687,17 @@ with lib.maintainers;
     shortName = "Kodi";
   };
 
+  kubernetes = {
+    members = [
+      johanot
+      offline
+      saschagrunert
+      srhb
+    ];
+    scope = "Maintain the Kubernetes package and module";
+    shortName = "Kubernetes";
+  };
+
   libretro = {
     members = [
       aanderse
@@ -734,6 +735,19 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  lix = {
+    members = [
+      raitobezarius
+      qyriad
+      _9999years
+      lf-
+      alois31
+    ];
+    scope = "Maintain the Lix package manager inside of Nixpkgs.";
+    shortName = "Lix ecosystem";
+    enableFeatureFreezePing = true;
+  };
+
   llvm = {
     members = [
       dtzWill
@@ -772,6 +786,13 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  lua = {
+    githubTeams = [ "lua" ];
+    scope = "Maintain the lua ecosystem.";
+    shortName = "lua";
+    enableFeatureFreezePing = true;
+  };
+
   lumiguide = {
     # Verify additions by approval of an already existing member of the team.
     members = [
@@ -782,13 +803,6 @@ with lib.maintainers;
     shortName = "Lumiguide employees";
   };
 
-  lua = {
-    githubTeams = [ "lua" ];
-    scope = "Maintain the lua ecosystem.";
-    shortName = "lua";
-    enableFeatureFreezePing = true;
-  };
-
   lumina = {
     members = [ romildo ];
     githubTeams = [ "lumina" ];
@@ -849,19 +863,6 @@ with lib.maintainers;
     shortName = "Matrix";
   };
 
-  minimal-bootstrap = {
-    members = [
-      alejandrosame
-      artturin
-      emilytrau
-      ericson2314
-      jk
-      siraben
-    ];
-    scope = "Maintain the minimal-bootstrap toolchain and related packages.";
-    shortName = "Minimal Bootstrap";
-  };
-
   mercury = {
     members = [
       _9999years
@@ -874,31 +875,17 @@ with lib.maintainers;
     shortName = "Mercury Employees";
   };
 
-  # same as https://github.com/orgs/NixOS/teams/nix-team
-  nix = {
+  minimal-bootstrap = {
     members = [
-      eelco
-      mic92
-      tomberek
-      roberth
+      alejandrosame
+      artturin
+      emilytrau
       ericson2314
+      jk
+      siraben
     ];
-    scope = "Maintain the Nix package manager.";
-    shortName = "Nix/nix-cli ecosystem";
-    enableFeatureFreezePing = true;
-  };
-
-  lix = {
-    members = [
-      raitobezarius
-      qyriad
-      _9999years
-      lf-
-      alois31
-    ];
-    scope = "Maintain the Lix package manager inside of Nixpkgs.";
-    shortName = "Lix ecosystem";
-    enableFeatureFreezePing = true;
+    scope = "Maintain the minimal-bootstrap toolchain and related packages.";
+    shortName = "Minimal Bootstrap";
   };
 
   module-system = {
@@ -949,6 +936,20 @@ with lib.maintainers;
     shortName = "NGI";
   };
 
+  # same as https://github.com/orgs/NixOS/teams/nix-team
+  nix = {
+    members = [
+      eelco
+      mic92
+      tomberek
+      roberth
+      ericson2314
+    ];
+    scope = "Maintain the Nix package manager.";
+    shortName = "Nix/nix-cli ecosystem";
+    enableFeatureFreezePing = true;
+  };
+
   nixos-rebuild = {
     members = [ thiagokokada ];
     scope = "Maintain nixos-rebuild(-ng).";
@@ -1166,12 +1167,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  sphinx = {
-    members = [ ];
-    scope = "Maintain Sphinx related packages.";
-    shortName = "Sphinx";
-  };
-
   serokell = {
     # Verify additions by approval of an already existing member of the team.
     members = [ balsoft ];
@@ -1179,6 +1174,12 @@ with lib.maintainers;
     shortName = "Serokell employees";
   };
 
+  sphinx = {
+    members = [ ];
+    scope = "Maintain Sphinx related packages.";
+    shortName = "Sphinx";
+  };
+
   stdenv = {
     members = [
       artturin
@@ -1262,6 +1263,16 @@ with lib.maintainers;
     shortName = "Uzinfocom Open Source";
   };
 
+  wdz = {
+    members = [
+      n0emis
+      johannwagner
+      yuka
+    ];
+    scope = "Group registration for WDZ GmbH team members who collectively maintain packages.";
+    shortName = "WDZ GmbH";
+  };
+
   windows = {
     members = [
       RossSmyth
@@ -1273,16 +1284,6 @@ with lib.maintainers;
     shortName = "Windows";
   };
 
-  wdz = {
-    members = [
-      n0emis
-      johannwagner
-      yuka
-    ];
-    scope = "Group registration for WDZ GmbH team members who collectively maintain packages.";
-    shortName = "WDZ GmbH";
-  };
-
   xen = {
     members = [
       hehongbo
@@ -1316,4 +1317,5 @@ with lib.maintainers;
     shortName = "Zig";
     enableFeatureFreezePing = true;
   };
+  # keep-sorted end
 }