diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5314a22833d1..c341d71b7ae8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2539,6 +2539,13 @@
     githubId = 59499799;
     keys = [ { fingerprint = "A0FF 4F26 6B80 0B86 726D  EA5B 3C23 C7BD 9945 2036"; } ];
   };
+  averyvigolo = {
+    email = "nixpkgs@averyv.me";
+    github = "averyvigolo";
+    githubId = 26379999;
+    name = "Avery Vigolo";
+    keys = [ { fingerprint = "9848 B216 BCBE 29BB 1C6A  E0D5 7A4D F5A8 CDBD 49C7"; } ];
+  };
   avh4 = {
     email = "gruen0aermel@gmail.com";
     github = "avh4";
@@ -26644,13 +26651,6 @@
     githubId = 5185341;
     name = "Will Cohen";
   };
-  williamvds = {
-    email = "nixpkgs@williamvds.me";
-    github = "williamvds";
-    githubId = 26379999;
-    name = "William Vigolo";
-    keys = [ { fingerprint = "9848 B216 BCBE 29BB 1C6A  E0D5 7A4D F5A8 CDBD 49C7"; } ];
-  };
   willibutz = {
     email = "willibutz@posteo.de";
     github = "WilliButz";
diff --git a/nixos/modules/services/networking/pihole-ftl.nix b/nixos/modules/services/networking/pihole-ftl.nix
index 45cd2e5f927b..9920d269a501 100644
--- a/nixos/modules/services/networking/pihole-ftl.nix
+++ b/nixos/modules/services/networking/pihole-ftl.nix
@@ -478,6 +478,6 @@ in
 
   meta = {
     doc = ./pihole-ftl.md;
-    maintainers = with lib.maintainers; [ williamvds ];
+    maintainers = with lib.maintainers; [ averyvigolo ];
   };
 }
diff --git a/nixos/modules/services/web-apps/pihole-web.nix b/nixos/modules/services/web-apps/pihole-web.nix
index fe62dec6afed..90c78b5299d5 100644
--- a/nixos/modules/services/web-apps/pihole-web.nix
+++ b/nixos/modules/services/web-apps/pihole-web.nix
@@ -99,6 +99,6 @@ in
 
   meta = {
     doc = ./pihole-web.md;
-    maintainers = with lib.maintainers; [ williamvds ];
+    maintainers = with lib.maintainers; [ averyvigolo ];
   };
 }
diff --git a/pkgs/by-name/aw/aws-assume-role/package.nix b/pkgs/by-name/aw/aws-assume-role/package.nix
index 334b6c1ccbe8..9a5556f8dd6e 100644
--- a/pkgs/by-name/aw/aws-assume-role/package.nix
+++ b/pkgs/by-name/aw/aws-assume-role/package.nix
@@ -38,7 +38,7 @@ buildGoModule rec {
     homepage = "https://github.com/remind101/assume-role";
     license = licenses.bsd2;
     mainProgram = "assume-role";
-    maintainers = with lib.maintainers; [ williamvds ];
+    maintainers = with lib.maintainers; [ averyvigolo ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/pi/pihole-ftl/package.nix b/pkgs/by-name/pi/pihole-ftl/package.nix
index 2d3add1f70bc..281d5231fbf0 100644
--- a/pkgs/by-name/pi/pihole-ftl/package.nix
+++ b/pkgs/by-name/pi/pihole-ftl/package.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Pi-hole FTL engine";
     homepage = "https://github.com/pi-hole/FTL";
     license = lib.licenses.eupl12;
-    maintainers = with lib.maintainers; [ williamvds ];
+    maintainers = with lib.maintainers; [ averyvigolo ];
     platforms = lib.platforms.linux;
     mainProgram = "pihole-FTL";
   };
diff --git a/pkgs/by-name/pi/pihole-web/package.nix b/pkgs/by-name/pi/pihole-web/package.nix
index 905987afd989..516b6862d2a3 100644
--- a/pkgs/by-name/pi/pihole-web/package.nix
+++ b/pkgs/by-name/pi/pihole-web/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
       FTLDNS.
     '';
     license = lib.licenses.eupl12;
-    maintainers = with lib.maintainers; [ williamvds ];
+    maintainers = with lib.maintainers; [ averyvigolo ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/pi/pihole/package.nix b/pkgs/by-name/pi/pihole/package.nix
index d1c6f575b053..55d051213750 100644
--- a/pkgs/by-name/pi/pihole/package.nix
+++ b/pkgs/by-name/pi/pihole/package.nix
@@ -234,7 +234,7 @@
   meta = {
     description = "A black hole for Internet advertisements";
     license = lib.licenses.eupl12;
-    maintainers = with lib.maintainers; [ williamvds ];
+    maintainers = with lib.maintainers; [ averyvigolo ];
     platforms = lib.platforms.linux;
     mainProgram = "pihole";
   };