diff --git a/.mailmap b/.mailmap
index 8e664e20d..b711a4a15 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,14 +14,22 @@ Allen Sun <allen.sun@daocloud.io>
 Bin Liu <liubin0329@gmail.com>
 Daniel Nephin <dnephin@gmail.com>
 Daniel Nephin <dnephin@gmail.com> <dnephin@docker.com>
+Fernando Miguel <github@FernandoMiguel.net>
+Fernando Miguel <github@FernandoMiguel.net> <FernandoMiguel@users.noreply.github.com>
 Helen Xie <chenjg@harmonycloud.cn>
+Himanshu Pandey <hpandey@pivotal.io>
+Hiromu Nakamura <abctail30@gmail.com>
 Jessica Frazelle <acidburn@microsoft.com>
 Jessica Frazelle <acidburn@microsoft.com> <acidburn@docker.com>
+Natasha Jarus <linuxmercedes@gmail.com>
 Sebastiaan van Stijn <github@gone.nl>
 Sebastiaan van Stijn <github@gone.nl> <thaJeztah@users.noreply.github.com>
 Tibor Vass <tibor@docker.com>
 Tibor Vass <tibor@docker.com> <tiborvass@users.noreply.github.com>
+Tomohiro Kusumoto <zabio1192@gmail.com>
 Tõnis Tiigi <tonistiigi@gmail.com>
 Vincent Demeester <vincent.demeester@docker.com>
 Vincent Demeester <vincent.demeester@docker.com> <vincent@sbr.pm>
+Ziv Tsarfati <digger18@gmail.com>
+Ziv Tsarfati <digger18@gmail.com> <digger18@users.noreply.github.com>
 郑泽宇 <perhapszzy@sina.com>
diff --git a/AUTHORS b/AUTHORS
index e6d993bae..c1dce6558 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,7 +3,7 @@
 
 Aaron L. Xu <likexu@harmonycloud.cn>
 Aaron Lehmann <aaron.lehmann@docker.com>
-Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
+Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 Alexander Morozov <lk4d4@docker.com>
 Alice Frosi <afrosi@de.ibm.com>
 Allen Sun <allen.sun@daocloud.io>
@@ -13,6 +13,7 @@ Arnaud Bailly <arnaud.oqube@gmail.com>
 Bin Liu <liubin0329@gmail.com>
 Brian Goff <cpuguy83@gmail.com>
 Daniel Nephin <dnephin@gmail.com>
+Dave Chen <dave.chen@arm.com>
 David Calavera <david.calavera@gmail.com>
 Dennis Chen <dennis.chen@arm.com>
 Derek McGowan <derek@mcgstyle.net>
@@ -20,8 +21,13 @@ Doug Davis <dug@us.ibm.com>
 Edgar Lee <edgarl@netflix.com>
 Eli Uriegas <eli.uriegas@docker.com>
 f0 <f0@users.noreply.github.com>
+Fernando Miguel <github@FernandoMiguel.net>
+Hao Hu <hao.hu.fr@gmail.com>
 Helen Xie <chenjg@harmonycloud.cn>
+Himanshu Pandey <hpandey@pivotal.io>
+Hiromu Nakamura <abctail30@gmail.com>
 Ian Campbell <ijc@docker.com>
+Iskander (Alex) Sharipov <quasilyte@gmail.com>
 Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
 Jessica Frazelle <acidburn@microsoft.com>
 John Howard <jhoward@microsoft.com>
@@ -34,8 +40,10 @@ Matt Rickard <mrick@google.com>
 Michael Crosby <crosbymichael@gmail.com>
 Miyachi Katsuya <miyachi_katsuya@r.recruit.co.jp>
 Nao YONASHIRO <yonashiro@r.recruit.co.jp>
+Natasha Jarus <linuxmercedes@gmail.com>
 Noel Georgi <18496730+frezbo@users.noreply.github.com>
 Ondrej Fabry <ofabry@cisco.com>
+Patrick Van Stee <patrick@vanstee.me>
 Ri Xu <xuri.me@gmail.com>
 Sebastiaan van Stijn <github@gone.nl>
 Shev Yan <yandong_8212@163.com>
@@ -48,9 +56,11 @@ Tiffany Jernigan <tiffany.f.j@gmail.com>
 Tino Rusch <tino.rusch@gmail.com>
 Tobias Klauser <tklauser@distanz.ch>
 Tomas Tomecek <ttomecek@redhat.com>
+Tomohiro Kusumoto <zabio1192@gmail.com>
 Tõnis Tiigi <tonistiigi@gmail.com>
 Vincent Demeester <vincent.demeester@docker.com>
 Wei Fu <fuweid89@gmail.com>
 Yong Tang <yong.tang.github@outlook.com>
 Yuichiro Kaneko <spiketeika@gmail.com>
+Ziv Tsarfati <digger18@gmail.com>
 郑泽宇 <perhapszzy@sina.com>