diff --git a/.mailmap b/.mailmap
index f1c1a287ad2ffb..f551c22cfd3d50 100644
--- a/.mailmap
+++ b/.mailmap
@@ -350,6 +350,7 @@ Sam P Gallagher-Bishop <samgallagherb@gmail.com> <SPGB@users.noreply.github.com>
 Sam Roberts <vieuxtech@gmail.com> <sam@strongloop.com>
 Sam Shull <brickysam26@gmail.com> <brickysam26@samuel-shulls-computer.local>
 Sam Shull <brickysam26@gmail.com> <sshull@squaremouth.com>
+Samuel Attard <samuel.r.attard@gmail.com> <sattard@slack-corp.com>
 Samantha Sample <ssample812@gmail.com> <=>
 Sambasiva Suda <sambasivarao@gmail.com>
 San-Tai Hsu <v@fatpipi.com>
@@ -360,6 +361,7 @@ Saúl Ibarra Corretgé <s@saghul.net> <saghul@gmail.com>
 Scott Blomquist <github@scott.blomqui.st> <sblom@microsoft.com>
 Segu Riluvan <rilwan22@hotmail.com> <riluvan@gmail.com>
 Sergey Kryzhanovsky <skryzhanovsky@gmail.com> <another@dhcp199-223-red.yandex.net>
+Sergey Zelenov <mail@zelenov.su> <sergey.zelenov@getyourguide.com>
 Shannen Saez <shannenlaptop@gmail.com>
 Shaopeng Zhang <szhang351@bloomberg.net>
 Shelley Vohr <shelley.vohr@gmail.com> <codebytere@gmail.com>
@@ -386,6 +388,7 @@ Stewart X Addison <sxa@redhat.com> <sxa@uk.ibm.com>
 Suraiya Hameed <hameedsuraiya@gmail.com>
 Suramya shah <shah.suramya@gmail.com> <ss22ever@users.noreply.github.com>
 Surya Panikkal <surya.com@gmail.com>
+Szymon Marczak <sz.marczak@gmail.com> <36894700+szmarczak@users.noreply.github.com>
 Tadashi SAWADA <cesare@mayverse.jp>
 Tadhg Creedon <tadhgcreedon@gmail.com> <tadhg.creedon@rangle.io>
 Taehee Kang <hugnosis@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index df2fcbb5f937c8..38985ae3b02084 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2791,7 +2791,6 @@ Mike MacCana <mike.maccana@gmail.com>
 Tim Baverstock <tim.baverstock@corp.badoo.com>
 Walle Cyril <cyril.walle@protonmail.com>
 Xu Meng <dmabupt@gmail.com>
-Samuel Attard <sattard@slack-corp.com>
 Ben L. Titzer <titzer@google.com>
 Ojasvi Monga <ojasvi@Ojasvis-MacBook-Air.local>
 Shajan Jacob <shajanjp@gmail.com>
@@ -3008,7 +3007,6 @@ Andrew Neitsch <andrew@neitsch.ca>
 RamanandPatil <ramanand.patil@gmail.com>
 forfun414 <forfun414@gmail.com>
 David Gilbertson <gilbertson.david@gmail.com>
-Sergey Zelenov <sergey.zelenov@getyourguide.com>
 Eric Bickle <ebickle@users.noreply.github.com>
 Joe Pea <joe@trusktr.io>
 ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
@@ -3165,7 +3163,6 @@ krank2me <alejok6@gmail.com>
 masx200 <34191203+masx200@users.noreply.github.com>
 Baruch Odem (Rothkoff) <baruchiro@gmail.com>
 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>
 Aleksandr Krutko <Oleksandr.Krutko@ibm.com>