diff --git a/.mailmap b/.mailmap
index 5f8046d9e18..18c3c02beb1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,12 +18,18 @@ Alexandru Cihodaru <cihodar@amazon.com>
 Liviu Berciu <lberciu@amazon.com>
 Jonathan Woollett-Light <jcawl@amazon.co.uk> <jonathanwoollettlight@gmail.com>
 Jonathan Woollett-Light <jcawl@amazon.co.uk> <jonthanwoollettlight@gmail.com>
-Sudan Landge <sudanl@amazon.com> <sudan@amazon.co.uk>
+Sudan Landge <sudanl@amazon.co.uk> <119602619+sudanl0@users.noreply.github.com>
+Sudan Landge <sudanl@amazon.co.uk> <sudanl@amazon.com>
 karthik nedunchezhiyan <karthik.n@zohocorp.com>
 Babis Chalios <bchalios@amazon.es> <babis.chalios@gmail.com>
 Pablo Barbáchano <pablob@amazon.com>
 Nikita Kalyazin <kalyazin@amazon.co.uk> <kalyazin@amazon.com>
 Trăistaru Andrei Cristian <atc@amazon.com>
 Trăistaru Andrei Cristian <atc@amazon.com> <56828222+andreitraistaru@users.noreply.github.com>
-Sudan Landge <sudanl@amazon.com> <sudanl@amazon.co.uk>
 Takahiro Itazuri <itazur@amazon.com> <zulinx86@gmail.com>
+Jack Thomson <jackabt@amazon.co.uk> <jackabt@amazon.com>
+Ashwin Ginoria <aginoria@amazon.com> <ec2-user@ip-10-0-10-88.us-west-2.compute.internal>
+Muskaan Singla <msinglaa@amazon.com> <ec2-user@ip-172-31-1-28.us-west-2.compute.internal>
+Egor Lazarchuk <yegorlz@amazon.co.uk>
+Nikita Zakirov <zakironi@amazon.com> <ec2-user@ip-10-0-15-219.us-west-2.compute.internal>
+Tomoya Iwata <iwata.tomoya@classmethod.jp>
diff --git a/CREDITS.md b/CREDITS.md
index 6632de15eb2..2610d0e2962 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -181,7 +181,7 @@ Contributors to the Firecracker repository:
 - milahu <milahu@gmail.com>
 - moricho <ikeda.morito@gmail.com>
 - Muki Kiboigo <muki@kiboigo.com>
-- Muskaan Singla <ec2-user@ip-172-31-1-28.us-west-2.compute.internal>
+- Muskaan Singla <msinglaa@amazon.com>
 - Narek Galstyan <narekg@berkeley.edu>
 - Nathan Hoang <nathanhoang5@gmail.com>
 - Nathan Sizemore <nathanrsizemore@gmail.com>
@@ -226,7 +226,6 @@ Contributors to the Firecracker repository:
 - Sean Lavine <freewil@users.noreply.github.com>
 - Sebastien Boeuf <sebastien.boeuf@intel.com>
 - Serban Iorga <seriorga@amazon.com>
-- ShadowCurse <yegorlz@amazon.co.uk>
 - shakram02 <ahmedhamdyau@gmail.com>
 - Shen Jiale <shenjiale@baidu.com>
 - Shion Yamashita <shioyama1118@gmail.com>
@@ -235,7 +234,7 @@ Contributors to the Firecracker repository:
 - Sripracha <ramsri@amazon.com>
 - Stefan Nita <32079871+stefannita01@users.noreply.github.com>
 - StemCll <lydjotj6f@mozmail.com>
-- Sudan Landge <sudanl@amazon.com>
+- Sudan Landge <sudanl@amazon.co.uk>
 - sundar.preston.789@gmail.com <sundar.preston.789@gmail.com>
 - Takahiro Itazuri <itazur@amazon.com>
 - Tal Hoffman <talhof8@gmail.com>