diff --git a/.mailmap b/.mailmap
index 5cad26c95..db5d4a23d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,6 +11,7 @@ Anil Madhavapeddy <anil.madhavapeddy@docker.com> <anil@recoil.org>
 Dan Finneran <dan@thebsdbox.co.uk> <dan@dev.fnnrn.me>
 Dan Finneran <dan@thebsdbox.co.uk> <daniel.finneran@gmail.com>
 Dan Finneran <dan@thebsdbox.co.uk>
+David Protasowski <dprotaso@gmail.com>
 David Scott <dave.scott@docker.com> <dave.scott@unikernel.com>
 David Scott <dave.scott@docker.com> <dave@recoil.org>
 David Scott <dave.scott@docker.com> <djs55@users.noreply.github.com>
@@ -22,6 +23,8 @@ David Sheets <david.sheets@docker.com> <sheets@alum.mit.edu>
 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>
+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>
diff --git a/AUTHORS b/AUTHORS
index 76035e69c..e5d184928 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,6 +16,7 @@ Daniel Nephin <dnephin@gmail.com>
 Dave Freitag <dcfreita@us.ibm.com>
 Dave Tucker <dt@docker.com>
 David Gageot <david.gageot@docker.com>
+David Protasowski <dprotaso@gmail.com>
 David Scott <dave.scott@docker.com>
 David Sheets <david.sheets@docker.com>
 Dennis Chen <dennis.chen@arm.com>
@@ -31,6 +32,7 @@ Ilya Dmitrichenko <errordeveloper@gmail.com>
 Isaac Rodman <isaac@eyz.us>
 Istvan <l1x@users.noreply.github.com>
 Jason A. Donenfeld <Jason@zx2c4.com>
+Jeff Wu <jeff.wu.junfei@gmail.com>
 Jeffrey Hogan <jeff.hogan1@gmail.com>
 Jeremy Yallop <yallop@docker.com>
 Jes Ferrier <jes.ferrier@gmail.com>
@@ -45,8 +47,10 @@ Lorenzo Fontana <lo@linux.com>
 Luke Hodkinson <furious.luke@gmail.com>
 Madhu Venugopal <madhu@docker.com>
 Magnus Skjegstad <magnus.skjegstad@docker.com>
+Marco Mariani <marco.mariani@alterway.fr>
 Marcus van Dam <marcus@marcusvandam.nl>
 marten <marten.cassel@gmail.com>
+Mathieu Pasquet <mathieu.pasquet@alterway.fr>
 Matt Bajor <matt.bajor@workday.com>
 Matt Bentley <matt.bentley@docker.com>
 Matt Johnson <matjohn2@cisco.com>
@@ -58,6 +62,7 @@ Nathan Dautenhahn <ndd@seas.upenn.edu>
 Nathan LeClaire <nathan.leclaire@docker.com>
 Nick Jones <nick@dischord.org>
 Nico Di Rocco <dirocco.nico@gmail.com>
+Olaf Flebbe <of@oflebbe.de>
 Phil Estes <estesp@linux.vnet.ibm.com>
 Radu Matei <matei.radu94@gmail.com>
 Richard Mortier <mort@cantab.net>
@@ -68,8 +73,10 @@ 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>
+Thomas Conte <thomas@conte.com>
 Thomas Gazagnaire <thomas.gazagnaire@docker.com>
 Thomas Leonard <thomas.leonard@docker.com>
 Thomas Shaw <tomwillfixit@users.noreply.github.com>