diff --git a/.mailmap b/.mailmap
index 49df384b5a67..9dc0ba7a17d5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,5 +27,7 @@ superherointj <5861043+superherointj@users.noreply.github.com>
 Tomodachi94 <tomodachi94@protonmail.com> Tomo <68489118+Tomodachi94@users.noreply.github.com>
 Vladimír Čunát <v@cunat.cz> <vcunat@gmail.com>
 Vladimír Čunát <v@cunat.cz> <vladimir.cunat@nic.cz>
+Yifei Sun <ysun@hey.com>
+Yifei Sun <ysun@hey.com> StepBroBD <ysun@hey.com>
 Yifei Sun <ysun@hey.com> StepBroBD <Hi@StepBroBD.com>
 Yifei Sun <ysun@hey.com> <ysun+git@stepbrobd.com>
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 813c267fe665..790f9a04f3ed 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24057,9 +24057,9 @@
   stepbrobd = {
     name = "Yifei Sun";
     email = "ysun@hey.com";
+    matrix = "@stepbrobd:matrix.org";
     github = "stepbrobd";
     githubId = 81826728;
-    keys = [ { fingerprint = "AC7C 52E6 BA2F E8DE 8F0F  5D78 D973 170F 9B86 DB70"; } ];
   };
   stephank = {
     email = "nix@stephank.nl";