diff --git a/.mailmap b/.mailmap
index 860d3961458f68..6ee2b48dceb82b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -198,8 +198,8 @@ Hassaan Pasha <pasha.hassaan@gmail.com> <hassaan.pasha@teamo.io>
 Hendrik Schwalm <mail@hendrikschwalm.de>
 Henry Chin <hheennrryy@gmail.com>
 Herbert Vojčík <herby@mailbox.sk>
-himself65 <himself65@outlook.com> <himself65@mask.io>
-himself65 <himself65@outlook.com> <himself6565@gmail.com>
+Zeyu "Alex" Yang <himself65@outlook.com> <himself65@mask.io>
+Zeyu "Alex" Yang <himself65@outlook.com> <himself6565@gmail.com>
 Hitesh Kanwathirtha <hiteshk@microsoft.com> <digitalinfinity@gmail.com>
 Icer Liang <liangshuangde@163.com> <wizicer@users.noreply.github.com>
 Igor Savin <iselwin@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index e4f646bd522f34..185e540e26a6ee 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2686,7 +2686,7 @@ Alexander Sattelmaier <alexander.sattelmaier@gmail.com>
 Avi ד <avi.the.coder@gmail.com>
 Thomas <hakerh403@gmail.com>
 Aymen Naghmouchi <aymen.aymen@live.it>
-himself65 <himself65@outlook.com>
+Zeyu "Alex" Yang <himself65@outlook.com>
 Patrick Gansterer <paroga@paroga.com>
 Nicolas Moteau <nicolas.moteau@orange.com>
 Anthony Tuininga <anthony.tuininga@oracle.com>
@@ -3459,5 +3459,6 @@ liuxingbaoyu <30521560+liuxingbaoyu@users.noreply.github.com>
 Sergey Nazaryev <sergey@nazaryev.com>
 William Marlow <william.marlow@ibm.com>
 Keyhan Vakil <60900335+airtable-keyhanvakil@users.noreply.github.com>
+Feng Yu <F3n67u@outlook.com>
 
 # Generated by tools/update-authors.js