diff --git a/.mailmap b/.mailmap
index dddc3965f0..50eb0a6731 100644
--- a/.mailmap
+++ b/.mailmap
@@ -35,3 +35,87 @@ Martin Jäger <martin@libre.solar>  <17674105+martinjaeger@users.noreply.github.
 Armand Ciejak <armand@riedonetworks.com>  <armandciejak@users.noreply.github.com>
 Chunlin Han <chunlin.han@linaro.org> <chunlin.han@acer.com>
 chao an <anchao@xiaomi.com>
+Martí Bolívar <marti.bolivar@nordicsemi.no>
+Martí Bolívar <marti.bolivar@nordicsemi.no> <marti.bolivar@linaro.org>
+Martí Bolívar <marti.bolivar@nordicsemi.no> <marti.f.bolivar@gmail.com>
+Martí Bolívar <marti.bolivar@nordicsemi.no> <marti@foundries.io>
+Martí Bolívar <marti.bolivar@nordicsemi.no> <marti@opensourcefoundries.com>
+Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
+Francois Ramu <francois.ramu@st.com>
+David Leach <david.leach@nxp.com>
+Raja D. Singh <rdsingh@iotwizards.com>
+Scott Worley <scott.worley@microchip.com>
+Łukasz Mazur <lukasz.mazur@hidglobal.com>
+Julien D'Ascenzio <julien.dascenzio@paratronic.fr>
+Jørgen Kvalvaag <jorgen.kvalvaag@nordicsemi.no>
+Stine Åkredalen <stine.akredalen@nordicsemi.no>
+Mohan Kumar Kumar <mohankm@fb.com>
+Gregory Shue <gregory.shue@legrand.com>
+Gregory Shue <gregory.shue@legrand.com> <gregory.shue@legrand.us>
+Alexandre d'Alton <alexandre.dalton@intel.com>
+Jarno Lämsä <jarno.lamsa@nordicsemi.no>
+Andrzej Kuroś <andrzej.kuros@nordicsemi.no>
+Katarzyna Giądła <katarzyna.giadla@nordicsemi.no>
+Manuel Argüelles <manuel.arguelles@nxp.com>
+Manuel Argüelles <manuel.arguelles@nxp.com> <manuel.arguelles@coredumplabs.com>
+Paweł Czarnecki <pczarnecki@antmicro.com>
+Pavel Král <pavel.kral@omsquare.com>
+Enjia Mai <enjia.mai@intel.com>
+Enjia Mai <enjia.mai@intel.com> <enjiax.mai@intel.com>
+Stéphane D'Alu <sdalu@sdalu.com>
+Paweł Kwiek <pawel.kwiek@nordicsemi.no>
+Navin Sankar Velliangiri <navin@linumiz.com>
+Mateusz Hołenko <mholenko@antmicro.com>
+Marin Jurjević <marin.jurjevic@hotmail.com>
+NingX Zhao <ningx.zhao@intel.com>
+Paweł Czarnecki <pczarnecki@antmicro.com>
+Paweł Czarnecki <pczarnecki@antmicro.com> <pczarnecki@internships.antmicro.com>
+Radosław Koppel <radoslaw.koppel@nordicsemi.no>
+Radosław Koppel <radoslaw.koppel@nordicsemi.no> <r.koppel@k-el.com>
+Aska Wu <aska.wu@linaro.org>
+Peter Johanson <peter@peterjohanson.com>
+Evgeniy Paltsev <PaltsevEvgeniy@gmail.com>
+Evgeniy Paltsev <PaltsevEvgeniy@gmail.com> <Eugeniy.Paltsev@synopsys.com>
+Ricardo Salveti <ricardo@opensourcefoundries.com>
+Ricardo Salveti <ricardo@opensourcefoundries.com> <ricardo.salveti@linaro.org>
+Jędrzej Ciupis <jedrzej.ciupis@nordicsemi.no>
+Michal Narajowski <michal.narajowski@codecoup.pl>
+Ole Sæther <ole.saether@nordicsemi.no>
+Christoph Schnetzler <christoph.schnetzler@husqvarnagroup.com>
+David B. Kinder <david.b.kinder@intel.com>
+Peter Bigot <peter.bigot@nordicsemi.no>
+Peter Bigot <peter.bigot@nordicsemi.no> <pab@pabigot.com>
+Sigvart Hovland <sigvart.hovland@nordicsemi.no>
+Charles E. Youse <charles.youse@intel.com>
+Mariusz Skamra <mariusz.skamra@codecoup.pl>
+Mariusz Skamra <mariusz.skamra@codecoup.pl> <mariusz.skamra@tieto.com>
+Michael Rosen <michael.r.rosen@intel.com>
+David Komel <a8961713@gmail.com>
+Bjarki Arge Andreasen <baa@trackunit.com>
+Christopher Friedt <cfriedt@meta.com>
+Christopher Friedt <cfriedt@meta.com> <cfriedt@fb.com>
+James Johnson <james.johnson672@t-mobile.com>
+Alexandr Kolosov <rikorsev@gmail.com>
+Saku Rautio <saku.rautio@nordicsemi.no>
+Sharron Liu <sharron.liu@intel.com>
+Anthony Smigielski <thebasti0ncode@gmail.com>
+YouhuaX Zhu <youhuax.zhu@intel.com>
+Mariusz Ryndzionek <mariusz.ryndzionek@firmwave.com>
+Ming Shao <ming.shao@intel.com>
+Juan Manuel Cruz Alcaraz <juan.m.cruz.alcaraz@intel.com>
+Piyush Itankar <piyush.t.itankar@intel.com>
+Kamil Sroka <kamil.sroka@nordicsemi.no>
+Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
+Jim Benjamin Luther <jilu@oticon.com>
+HaiLong Yang <cameledyang@pm.me>
+Christoph Schramm <schramm@makaio.com>
+Lixin Guo <lixinx.guo@intel.com>
+Juan Solano <juanx.solano.menacho@intel.com>
+Shilpashree L C <shilpashree.lc@intel.com>
+Yonattan Louise <yonattan.a.louise.mendoza@intel.com>
+Yonattan Louise <yonattan.a.louise.mendoza@intel.com> <yonattan.a.louise.mendoza@linux.intel.com>
+Findlay Feng <i@fengch.me>
+Peng Chen <peng1.chen@intel.com>
+Chen Xingyu <hi@xingrz.me>
+Tim Sørensen <tims@demant.com>
+Tim Sørensen <tims@demant.com> <tims@oticon.com>