diff --git a/.mailmap b/.mailmap
index ae2c24a91b..c033d1e6cf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -384,9 +384,9 @@ Ju Dingyang <hu.dingyang@zte.com.cn>
 Julien Bordellier <julienbordellier@gmail.com> <git@julienbordellier.com>
 Julien Bordellier <julienbordellier@gmail.com> <me@julienbordellier.com>
 Jun Du <dujun5@huawei.com>
-Justin Cormack <justin.cormack@docker.com>
-Justin Cormack <justin.cormack@docker.com> <justin.cormack@unikernel.com>
-Justin Cormack <justin.cormack@docker.com> <justin@specialbusservice.com>
+Justin Cormack <justin.cormack@specialbusservice.com>
+Justin Cormack <justin.cormack@specialbusservice.com> <justin.cormack@unikernel.com>
+Justin Cormack <justin.cormack@specialbusservice.com> <justin@docker.com>
 Justin Keller <85903732+jk-vb@users.noreply.github.com>
 Justin Keller <85903732+jk-vb@users.noreply.github.com> <jkeller@vb-jkeller-mbp.local>
 Justin Simonelis <justin.p.simonelis@gmail.com> <justin.simonelis@PTS-JSIMON2.toronto.exclamation.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index ba2d8c4768..d02b31dd85 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -21,7 +21,6 @@
 "crazy-max","Kevin Alvarez","contact@crazymax.dev"
 "dmcgowan","Derek McGowan","derek@mcgstyle.net"
 "estesp","Phil Estes","estesp@linux.vnet.ibm.com"
-"justincormack","Justin Cormack","justin.cormack@docker.com"
 "kolyshkin","Kir Kolyshkin","kolyshkin@gmail.com"
 "laurazard","Laura Brehm","laurabrehm@hey.com"
 "neersighted","Bjorn Neergaard","bjorn@neersighted.com"