diff --git a/.mailmap b/.mailmap
index 4f634365a..88c72f21d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,6 +32,7 @@ Radu Matei <matei.radu94@gmail.com>
 Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@berkeley.edu>
 Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@gmail.com>
 Rolf Neugebauer <rolf.neugebauer@docker.com> <rneugeba@users.noreply.github.com>
+Rolf Neugebauer <rolf.neugebauer@docker.com> <rn@users.noreply.github.com>
 Rolf Neugebauer <rolf.neugebauer@docker.com> <rolf.neugebauer@gmail.com>
 Sebastiaan van Stijn <sebastiaan.vanstijn@docker.com> <github@gone.nl>
 Simon Ferquel <simon.ferquel@docker.com> <simon.ferquel@hotmail.fr>
diff --git a/AUTHORS b/AUTHORS
index 159fb6dc5..1d47fbe96 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,6 +14,7 @@ David Gageot <david.gageot@docker.com>
 David Scott <dave.scott@docker.com>
 David Sheets <david.sheets@docker.com>
 Dieter Reuter <dieter.reuter@me.com>
+Edward Vielmetti <edward.vielmetti@gmail.com>
 French Ben <frenchben@docker.com>
 George Papanikolaou <g3orge.app@gmail.com>
 Gianluca Arbezzano <gianarb92@gmail.com>
@@ -21,6 +22,7 @@ Ian Campbell <ian.campbell@docker.com>
 Ilya Dmitrichenko <errordeveloper@gmail.com>
 Jeffrey Hogan <jeff.hogan1@gmail.com>
 Jeremy Yallop <yallop@docker.com>
+Jes Ferrier <jes.ferrier@gmail.com>
 Jesse Adametz <jesseadametz@gmail.com>
 John Albietz <inthecloud247@gmail.com>
 Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
@@ -29,6 +31,7 @@ Ken Cochrane <ken.cochrane@docker.com>
 Lorenzo Fontana <lo@linux.com>
 Madhu Venugopal <madhu@docker.com>
 Magnus Skjegstad <magnus.skjegstad@docker.com>
+Marcus van Dam <marcus@marcusvandam.nl>
 Matt Bajor <matt.bajor@workday.com>
 Michel Courtine <michel.courtine@docker.com>
 Mickaël Salaün <mic@digikod.net>
@@ -48,6 +51,7 @@ Simon Ferquel <simon.ferquel@docker.com>
 solidnerd <niclas@mietz.io>
 Theo Koulouris <theo.koulouris@hpe.com>
 Thomas Gazagnaire <thomas.gazagnaire@docker.com>
+Thomas Leonard <thomas.leonard@docker.com>
 Thomas Shaw <tomwillfixit@users.noreply.github.com>
 Tiago Pires <tandrepires@gmail.com>
 Tycho Andersen <tycho@docker.com>