diff --git a/.mailmap b/.mailmap
index 0ef14f4d5..b3fdbefbd 100644
--- a/.mailmap
+++ b/.mailmap
@@ -20,6 +20,7 @@ David Gageot <david.gageot@docker.com> <david@gageot.net>
 David Sheets <david.sheets@docker.com> <dsheets@docker.com>
 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>
 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>
@@ -40,4 +41,4 @@ Simon Ferquel <simon.ferquel@docker.com> <simon.ferquel@hotmail.fr>
 Thomas Gazagnaire <thomas.gazagnaire@docker.com> <thomas@gazagnaire.com>
 Thomas Gazagnaire <thomas.gazagnaire@docker.com> <thomas@gazagnaire.org>
 Vincent Demeester <Vincent.Demeester@docker.com> <vincent@sbr.pm>
-Vincent Demeester <Vincent.Demeester@docker.com> <vdemeester@docker.com>
\ No newline at end of file
+Vincent Demeester <Vincent.Demeester@docker.com> <vdemeester@docker.com>
diff --git a/AUTHORS b/AUTHORS
index 56011b576..1876e9e09 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,6 +22,7 @@ Edward Vielmetti <edward.vielmetti@gmail.com>
 French Ben <frenchben@docker.com>
 George Papanikolaou <g3orge.app@gmail.com>
 Gianluca Arbezzano <gianarb92@gmail.com>
+Hans van den Bogert <hansbogert@gmail.com>
 Ian Campbell <ian.campbell@docker.com>
 Ilya Dmitrichenko <errordeveloper@gmail.com>
 Jeffrey Hogan <jeff.hogan1@gmail.com>
@@ -33,6 +34,7 @@ Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
 Justin Cormack <justin.cormack@docker.com>
 Ken Cochrane <ken.cochrane@docker.com>
 Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
+Liqdfire <liqdfire@gmail.com>
 Lorenzo Fontana <lo@linux.com>
 Luke Hodkinson <furious.luke@gmail.com>
 Madhu Venugopal <madhu@docker.com>
@@ -52,9 +54,11 @@ Richard Mortier <mort@cantab.net>
 Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 Robb Kistler <robb.kistler@docker.com>
 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>
+Stefan Bourlon <stefan.bourlon@ca.com>
 Theo Koulouris <theo.koulouris@hpe.com>
 Thomas Gazagnaire <thomas.gazagnaire@docker.com>
 Thomas Leonard <thomas.leonard@docker.com>