diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 92699be51581..97f984849265 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -803,6 +803,13 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  neovim = {
+    members = [ ];
+    githubTeams = [ "neovim" ];
+    scope = "Maintain the vim and neovim text editors and related packages.";
+    shortName = "Vim/Neovim";
+  };
+
   ngi = {
     members = [
       eljamm
@@ -1089,16 +1096,6 @@ with lib.maintainers;
     shortName = "coqui-ai TTS";
   };
 
-  vim = {
-    members = [
-      figsoda
-      softinio
-      teto
-    ];
-    scope = "Maintain the vim and neovim text editors and related packages.";
-    shortName = "Vim/Neovim";
-  };
-
   wdz = {
     members = [
       n0emis
diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index f1e4db150b0d..b8d3e76cd16c 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -265,10 +265,7 @@ stdenv.mkDerivation (
         asl20
         vim
       ];
-      maintainers = with lib.maintainers; [
-        manveru
-        rvolosatovs
-      ];
+      maintainers = lib.teams.neovim.members;
       platforms = lib.platforms.unix;
     };
   }