diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json
index d8c8606bbdbf..9cb35f1fdf22 100644
--- a/maintainers/github-teams.json
+++ b/maintainers/github-teams.json
@@ -485,9 +485,9 @@
       "wrmilling": 6162814
     },
     "members": {
-      "azey7f": 41077433,
       "frederictobiasc": 26125115,
       "heywoodlh": 18178614,
+      "maevii": 41077433,
       "rorosen": 76747196
     },
     "name": "k3s"
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4084ba2a735d..18b0f121f75e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2809,14 +2809,6 @@
     githubId = 426541;
     name = "Tim Kleinschmidt";
   };
-  azey7f = {
-    email = "me@azey.net";
-    github = "azey7f";
-    githubId = 41077433;
-    name = "azey";
-    # assuming my nameservers are up: gpg --auto-key-locate clear,nodefault,cert,dane --locate-keys me@azey.net
-    keys = [ { fingerprint = "2CCB 3403 43FE 8A2B 91CE  7F75 F94F 4A71 C5C2 1E8F"; } ];
-  };
   azuwis = {
     email = "azuwis@gmail.com";
     github = "azuwis";
@@ -15867,6 +15859,14 @@
     githubId = 38541651;
     name = "maeve";
   };
+  maevii = {
+    email = "me@maevi.net";
+    github = "maevii";
+    githubId = 41077433;
+    name = "Maevi";
+    # assuming my nameservers are up: gpg --auto-key-locate clear,nodefault,cert,dane --locate-keys me@maevi.net
+    keys = [ { fingerprint = "A176 4D41 E826 A6E5 A5A1  8231 7670 F0F0 C946 12F4"; } ];
+  };
   mafo = {
     email = "Marc.Fontaine@gmx.de";
     github = "MarcFontaine";
diff --git a/pkgs/applications/networking/cluster/rke2/builder.nix b/pkgs/applications/networking/cluster/rke2/builder.nix
index 52b2baeb8b6f..e8afde0a7bb5 100644
--- a/pkgs/applications/networking/cluster/rke2/builder.nix
+++ b/pkgs/applications/networking/cluster/rke2/builder.nix
@@ -159,7 +159,7 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/rancher/rke2/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
-      azey7f
+      maevii
       rorosen
       zimbatm
       zygot
diff --git a/pkgs/by-name/li/libmnl/package.nix b/pkgs/by-name/li/libmnl/package.nix
index d43676f1af15..ed9e2570b138 100644
--- a/pkgs/by-name/li/libmnl/package.nix
+++ b/pkgs/by-name/li/libmnl/package.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://netfilter.org/projects/libmnl/index.html";
     license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ azey7f ];
+    maintainers = with lib.maintainers; [ maevii ];
   };
 })
diff --git a/pkgs/by-name/su/subunit/package.nix b/pkgs/by-name/su/subunit/package.nix
index 98095c1720a7..488e50ba2dd1 100644
--- a/pkgs/by-name/su/subunit/package.nix
+++ b/pkgs/by-name/su/subunit/package.nix
@@ -53,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
       bsd3
     ];
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ azey7f ];
+    maintainers = with lib.maintainers; [ maevii ];
   };
 })
diff --git a/pkgs/by-name/te/terminus_font/package.nix b/pkgs/by-name/te/terminus_font/package.nix
index 93edf50f5087..8aa2810fb211 100644
--- a/pkgs/by-name/te/terminus_font/package.nix
+++ b/pkgs/by-name/te/terminus_font/package.nix
@@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://terminus-font.sourceforge.net/";
     license = lib.licenses.ofl;
-    maintainers = with lib.maintainers; [ azey7f ];
+    maintainers = with lib.maintainers; [ maevii ];
   };
 })
diff --git a/pkgs/by-name/te/terminus_font_ttf/package.nix b/pkgs/by-name/te/terminus_font_ttf/package.nix
index e79b4be6883a..1d1cd985e756 100644
--- a/pkgs/by-name/te/terminus_font_ttf/package.nix
+++ b/pkgs/by-name/te/terminus_font_ttf/package.nix
@@ -34,6 +34,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     '';
     homepage = "https://files.ax86.net/terminus-ttf";
     license = lib.licenses.ofl;
-    maintainers = with lib.maintainers; [ azey7f ];
+    maintainers = with lib.maintainers; [ maevii ];
   };
 })
diff --git a/pkgs/by-name/vp/vpp/package.nix b/pkgs/by-name/vp/vpp/package.nix
index 35955b754bd5..303d805e93eb 100644
--- a/pkgs/by-name/vp/vpp/package.nix
+++ b/pkgs/by-name/vp/vpp/package.nix
@@ -134,6 +134,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
     mainProgram = "vpp";
-    maintainers = with lib.maintainers; [ azey7f ];
+    maintainers = with lib.maintainers; [ maevii ];
   };
 })