diff --git a/.mailmap b/.mailmap
index a7a36916790903..d6f2f6350914d1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -321,6 +321,8 @@ Reza Akhavan <reza@akhavan.me>
 Ricardo Sánchez Gregorio <me@richnologies.io>
 Richard Lau <rlau@redhat.com> <riclau@uk.ibm.com>
 Rick Olson <technoweenie@gmail.com>
+rickyes <0x19951125@gmail.com> <ives199511@gmail.com>
+rickyes <0x19951125@gmail.com> <mail@zhoumq.cn>
 Rob Adelmann <adelmann@adobe.com>
 Rob Adelmann <adelmann@adobe.com> <robadelmann@gmail.com>
 Robert Nagy <ronagy@icloud.com> Robert Nagy <robertnagy@Roberts-MacBook-Pro.local>
diff --git a/AUTHORS b/AUTHORS
index fb27f493b7a252..9c2afc726e14a9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2846,7 +2846,7 @@ Javier Ledezma <juls0593@gmail.com>
 Marian Rusnak <4215517+marian-r@users.noreply.github.com>
 Jenia <jeniabrook@gmail.com>
 Anton Gerasimov <agerasimov@twilio.com>
-rickyes <mail@zhoumq.cn>
+rickyes <0x19951125@gmail.com>
 Simon A. Eugster <simon.eu@gmail.com>
 TATSUNO Yasuhiro <ytatsuno.jp@gmail.com>
 Robert Jensen <rjensen@butterflynetwork.com>
@@ -3083,7 +3083,6 @@ Ben Bucksch <ben.bucksch@beonex.com>
 Eli Schwartz <eschwartz@archlinux.org>
 Maciej Kacper Jagiełło <maciej@jagiello.it>
 Tom Nagle <tomanagle@gmail.com>
-rickyes <ives199511@gmail.com>
 sapics <gv.nishino@gmail.com>
 Sagar Jadhav <sagarj.jadhav23@gmail.com>
 Dennis Ameling <dennis@dennisameling.com>
@@ -3178,7 +3177,6 @@ Mattias Runge-Broberg <mattias@runge.se>
 Szymon Marczak <36894700+szmarczak@users.noreply.github.com>
 Dmitry Semigradsky <semigradskyd@gmail.com>
 Ole André Vadla Ravnås <oleavr@gmail.com>
-rickyes <0x19951125@gmail.com>
 Aleksandr Krutko <Oleksandr.Krutko@ibm.com>
 Brian Ingenito <28159742+bingenito@users.noreply.github.com>
 FeelyChau <feely@outlook.com>