diff --git a/.mailmap b/.mailmap
index b393e9e056d0e9cf9006cb9ba0d6034ab1fd1af3..1c7816bda19f21961b7057dd95c97b954138e92a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -29,6 +29,7 @@ Francisco Guerrero <aguerrero@pivotal.io> <frankgh@users.noreply.github.com>
 Gang Xiong <gxiong@pivotal.io> xiong-gang <gxiong@pivotal.io>
 Haisheng Yuan <hyuan@pivotal.io> HaiSheng Yuan <hyuan@pivotal.io>
 Haisheng Yuan and Jesse Zhang <sbjesse@gmail.com> HaiSheng Yuan and Jesse Zhang <sbjesse@gmail.com>
+Haisheng Yuan and Xin Zhang <hyuan+xzhang@pivotal.io> HaiSheng Yuan and Xin Zhang <hyuan@pivotal.io>
 Hao Wu <gfphoenix78@gmail.com> <hawu@pivotal.io>
 Hao Wu <gfphoenix78@gmail.com> <37101401+gfphoenix78@users.noreply.github.com>
 Huiliang Liu <huliu@pivotal.io> Huiliang.liu <huiliang.lhl@qq.com>
@@ -72,6 +73,7 @@ Shreedhar Hardikar <shardikar@pivotal.io> <hardikar@users.noreply.github.com>
 Shujie Zhang <shzhang@pivotal.io> Zhang Shujie <35027678+zhangjackey@users.noreply.github.com>
 Shujie Zhang <shzhang@pivotal.io> ZhangJackey <35027678+zhangjackey@users.noreply.github.com>
 Stephen Wu <stwu@pivotal.io> <shwu@users.noreply.github.com>
+Teng Zhang <tezhang@pivotal.io> Teng zhang <tezhang@pivotal.io>
 Tingfang Bao <bbao@pivotal.io> Bob Bao <bbao@pivotal.io>
 Trevor Yacovone <tyacovone@pivotal.io> <38438025+tyacovone@users.noreply.github.com>
 Venkatesh Raghavan <vraghavan@pivotal.io> Venkatesh (Venky) Raghavan <vraghavan@pivotal.io>