diff --git a/.mailmap b/.mailmap
index db5d4a23d..642c9a767 100644
--- a/.mailmap
+++ b/.mailmap
@@ -24,16 +24,20 @@ Ian Campbell <ian.campbell@docker.com> <ijc25@users.noreply.github.com>
 Ian Campbell <ian.campbell@docker.com> <ijc@docker.com>
 Ian Campbell <ian.campbell@docker.com> <ijc@users.noreply.github.com>
 Isaac Rodman <isaac@eyz.us> <isaac.rodman@healthtrio.com>
+Istvan Szukacs <l1x@users.noreply.github.com>
 Jeff Wu <jeff.wu.junfei@gmail.com> <JeffWuBJ@users.noreply.github.com>
 Jeremy Yallop <yallop@docker.com> <yallop@gmail.com>
 Justin Cormack <justin.cormack@docker.com> <justin.cormack@unikernel.com>
 Justin Cormack <justin.cormack@docker.com> <justin@specialbusservice.com>
 Ken Cochrane <ken.cochrane@docker.com> <KenCochrane@gmail.com>
 Magnus Skjegstad <magnus.skjegstad@docker.com> <magnus@skjegstad.com>
+Marten Cassel <marten.cassel@gmail.com> <mcpop28@hotmail.com>
 Mindy Preston <mindy.preston@docker.com> <meetup@yomimono.org>
 Nathan Dautenhahn <ndd@seas.upenn.edu> <ndd@cis.upenn.edu>
 Nathan LeClaire <nathan.leclaire@docker.com> <nathan.leclaire@gmail.com>
 Nathan LeClaire <nathan.leclaire@docker.com> <nathanleclaire@gmail.com>
+Niclas Mietz <niclas@mietz.io>
+Pierre Gayvallet <pierre.gayvallet@docker.com> <pierre.gayvallet@gmail.com>
 Radu Matei <matei.radu94@gmail.com>
 Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@berkeley.edu>
 Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index e5d184928..fbca543a0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,11 +26,12 @@ Eric Briand <eric.briand@gmail.com>
 French Ben <frenchben@docker.com>
 George Papanikolaou <g3orge.app@gmail.com>
 Gianluca Arbezzano <gianarb92@gmail.com>
+Guillaume Rose <guillaume.rose@docker.com>
 Hans van den Bogert <hansbogert@gmail.com>
 Ian Campbell <ian.campbell@docker.com>
 Ilya Dmitrichenko <errordeveloper@gmail.com>
 Isaac Rodman <isaac@eyz.us>
-Istvan <l1x@users.noreply.github.com>
+Istvan Szukacs <l1x@users.noreply.github.com>
 Jason A. Donenfeld <Jason@zx2c4.com>
 Jeff Wu <jeff.wu.junfei@gmail.com>
 Jeffrey Hogan <jeff.hogan1@gmail.com>
@@ -61,9 +62,11 @@ Natanael Copa <natanael.copa@docker.com>
 Nathan Dautenhahn <ndd@seas.upenn.edu>
 Nathan LeClaire <nathan.leclaire@docker.com>
 Nick Jones <nick@dischord.org>
+Niclas Mietz <niclas@mietz.io>
 Nico Di Rocco <dirocco.nico@gmail.com>
 Olaf Flebbe <of@oflebbe.de>
 Phil Estes <estesp@linux.vnet.ibm.com>
+Pierre Gayvallet <pierre.gayvallet@docker.com>
 Radu Matei <matei.radu94@gmail.com>
 Richard Mortier <mort@cantab.net>
 Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
@@ -72,7 +75,6 @@ Rolf Neugebauer <rolf.neugebauer@docker.com>
 Ryoga Saito <proelbtn@gmail.com>
 Sebastiaan van Stijn <sebastiaan.vanstijn@docker.com>
 Simon Ferquel <simon.ferquel@docker.com>
-solidnerd <niclas@mietz.io>
 Sotiris Salloumis <sotiris.salloumis@gmail.com>
 Stefan Bourlon <stefan.bourlon@ca.com>
 Theo Koulouris <theo.koulouris@hpe.com>
@@ -84,4 +86,5 @@ Tiago Pires <tandrepires@gmail.com>
 Tim Potter <tpot@hpe.com>
 Tycho Andersen <tycho@docker.com>
 Vincent Demeester <Vincent.Demeester@docker.com>
+w9n <w9ncontact@gmail.com>
 Zachery Hostens <zacheryph@gmail.com>