diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index cb0c001ccd8b..0600a019ffa7 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -387,6 +387,17 @@ with lib.maintainers;
     shortName = "dotnet";
   };
 
+  electron = {
+    members = [
+      tomasajt
+      yayayayaka
+      teutat3s
+    ];
+    scope = "Maintainers of electron packages";
+    shortName = "electron";
+    enableFeatureFreezePing = true;
+  };
+
   emacs = {
     members = [
       AndersonTorres
diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix
index 7de6c458757f..18d912514c4e 100644
--- a/pkgs/development/tools/electron/binary/generic.nix
+++ b/pkgs/development/tools/electron/binary/generic.nix
@@ -44,11 +44,7 @@ let
     homepage = "https://github.com/electron/electron";
     license = licenses.mit;
     mainProgram = "electron";
-    maintainers = with maintainers; [
-      yayayayaka
-      teutat3s
-      tomasajt
-    ];
+    teams = [ teams.electron ];
     platforms = [
       "x86_64-darwin"
       "x86_64-linux"
diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix
index f04e1a91ce82..9eaa0470ab3d 100644
--- a/pkgs/development/tools/electron/chromedriver/generic.nix
+++ b/pkgs/development/tools/electron/chromedriver/generic.nix
@@ -29,8 +29,8 @@ let
     license = licenses.mit;
     maintainers = with maintainers; [
       liammurphy14
-      yayayayaka
     ];
+    teams = [ teams.electron ];
     platforms = [
       "x86_64-darwin"
       "x86_64-linux"
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index bedef826ea5e..c058c68c9b9e 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -323,11 +323,7 @@ in
     homepage = "https://github.com/electron/electron";
     platforms = lib.platforms.linux;
     license = licenses.mit;
-    maintainers = with maintainers; [
-      yayayayaka
-      teutat3s
-      tomasajt
-    ];
+    teams = [ teams.electron ];
     mainProgram = "electron";
     hydraPlatforms =
       lib.optionals (!(hasInfix "alpha" info.version) && !(hasInfix "beta" info.version))