diff --git a/.mailmap b/.mailmap
index f922b76746784f..8869af05f6bafe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -287,6 +287,8 @@ Ke Ding <dingkework@hotmail.com>
 Keith M Wesolowski <wesolows@joyent.com> <wesolows@foobazco.org>
 Kelsey Breseman <ifoundthemeaningoflife@gmail.com>
 Kevin Millikin <kmillikin@chromium.org>
+Keyhan Vakil <kvakil@sylph.kvakil.me> <60900335+airtable-keyhanvakil@users.noreply.github.com>
+Keyhan Vakil <kvakil@sylph.kvakil.me> <kvakil@github.kvakil.me>
 Khaidi Chu <i@2333.moe>
 Khaidi Chu <i@2333.moe> <admin@xcoder.in>
 Kimberly Wilber <gcr@sneakygcr.net>
diff --git a/AUTHORS b/AUTHORS
index f792f6357fe1a4..1583e4bcb6bb3c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1048,7 +1048,7 @@ Joran Siu <joransiu@ca.ibm.com>
 Vitaly Tomilov <vitaly-t@users.noreply.github.com>
 Ratikesh Misra <ratikesh92@gmail.com>
 Alex Perkins <aperkin@rei.com>
-Beth Griggs <bgriggs@redhat.com>
+Beth Griggs <bethanyngriggs@gmail.com>
 Joe Esposito <joe@joeyespo.com>
 Erin Spiceland <yes@erin.codes>
 Ravindra Barthwal <ravindrabarthwal@users.noreply.github.com>
@@ -3457,7 +3457,7 @@ Yagiz Nizipli <yagiz@nizipli.com>
 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>
+Keyhan Vakil <kvakil@sylph.kvakil.me>
 Feng Yu <F3n67u@outlook.com>
 pupilTong <pupiltong@outlook.com>
 rikapo <rikaporori@gmail.com>
@@ -3490,5 +3490,15 @@ John Gee <john@ruru.gen.nz>
 Hrishikesh Kadam <hrkadam.92@gmail.com>
 KrayzeeKev <github@lentinfamily.com>
 Airing <airing@ursb.me>
+jiahao.si <sijiahao0839@gmail.com>
+Rhys <Anemy@users.noreply.github.com>
+Mark S. Miller <erights@users.noreply.github.com>
+Jianru Lin <jianru.lin@gmail.com>
+Lenvin Gonsalves <41874033+98lenvi@users.noreply.github.com>
+Andreu Botella <andreu@andreubotella.com>
+shhh7612 <82669765+shhh7612@users.noreply.github.com>
+Dominic Saadi <dominiceliassaadi@gmail.com>
+ywave620 <60539365+ywave620@users.noreply.github.com>
+NicoNekoru <66227158+NicoNekoru@users.noreply.github.com>
 
 # Generated by tools/update-authors.mjs