diff --git a/.mailmap b/.mailmap
index f72ff441e1..00ee2a3459 100644
--- a/.mailmap
+++ b/.mailmap
@@ -58,7 +58,7 @@ Madhuri Kumari <madhuri.rai07@gmail.com> madhuri <madhuri@madhuri-VirtualBox.(no
 Morgan Fainberg <morgan.fainberg@gmail.com> <m@metacloud.com>
 Hua Zhang <zhuadl@cn.ibm.com> <zhuadl@cn.ibm.com>
 Yummy Bian <yummy.bian@gmail.com> <yummy.bian@gmail.com>
-Alistair Coles <alistair.coles@hp.com> <alistair.coles@hp.com>
+Alistair Coles <alistair.coles@hpe.com> <alistair.coles@hp.com>
 Tong Li <litong01@us.ibm.com> <litong01@us.ibm.com>
 Paul Luse <paul.e.luse@intel.com> <paul.e.luse@intel.com>
 Yuan Zhou <yuan.zhou@intel.com> <yuan.zhou@intel.com>
@@ -66,9 +66,9 @@ Jola Mirecka <jola.mirecka@hp.com> <jola.mirecka@hp.com>
 Ning Zhang <ning@zmanda.com> <ning@zmanda.com>
 Mauro Stettler <mauro.stettler@gmail.com> <mauro.stettler@gmail.com>
 Pawel Palucki <pawel.palucki@gmail.com> <pawel.palucki@gmail.com>
-Guang Yee <guang.yee@hp.com> <guang.yee@hp.com>
+Guang Yee <guang.yee@hpe.com> <guang.yee@hp.com>
 Jing Liuqing <jing.liuqing@99cloud.net> <jing.liuqing@99cloud.net>
-Lorcan Browne <lorcan.browne@hp.com> <lorcan.browne@hp.com>
+Lorcan Browne <lorcan.browne@hpe.com> <lorcan.browne@hp.com>
 Eohyung Lee <liquidnuker@gmail.com> <liquid@kt.com>
 Harshit Chitalia <harshit@acelio.com> <harshit@acelio.com>
 Richard Hawkins <richard.hawkins@rackspace.com>
@@ -83,3 +83,7 @@ Atsushi Sakai <sakaia@jp.fujitsu.com>
 Takashi Natsume <natsume.takashi@lab.ntt.co.jp>
 Nakagawa Masaaki <nakagawamsa@nttdata.co.jp> nakagawamsa
 Romain Le Disez <romain.ledisez@ovh.net> Romain LE DISEZ
+Donagh McCabe <donagh.mccabe@hpe.com> <donagh.mccabe@hp.com>
+Eamonn O'Toole <eamonn.otoole@hpe.com> <eamonn.otoole@hp.com>
+Gerry Drudy <gerry.drudy@hpe.com> <gerry.drudy@hp.com>
+Mark Seger <mark.seger@hpe.com> <mark.seger@hp.com>