diff --git a/src/pages/team/index.md b/src/pages/team/index.md
index d53de4dc1b..c428e6b003 100644
--- a/src/pages/team/index.md
+++ b/src/pages/team/index.md
@@ -10,30 +10,30 @@ Each Podling Project Management Committee (PPMC) helps its Podling learn how to
 
 | Name| Email | GitHub ID | Organization |
 |--|--|--|--|
-| Andrey Borodin | amborodin@acm.org | x4m |  Yandex Cloud |
-| Antonio Petrole | antoniopetrole@gmail.com | antoniopetrole | Individual |
-| Dianjin Wang | wangdianjin@gmail.com | tuhaihe | HashData |
+| Andrey Borodin | x4m@apache.org | x4m |  Yandex Cloud |
+| Antonio Petrole | apetrole@apache.org | antoniopetrole | Individual |
+| Dianjin Wang | djwang@apache.org | tuhaihe | HashData |
 | Ed Espino | espino@apache.org | edespino | Apache Member, Synx Data Labs |
-| Greg Spiegelberg | gspiegelberg@gmail.com | gspiegelberg | MNTN |
-| Hao Wu | gfphoenix78@gmail.com | gfphoenix78 | HashData |
-| Hope Gao | gaoxueyu_hope@163.com | gaoxueyu | HighGo |
-| Jianghua Yang | yjhjstz@gmail.com | yjhjstz | HashData |
-| Jiaqi Zhou | jiaqizho@163.com | jiaqizho | Zilliz |
-| Jinbao Chen | chenjinbao1989@gmail.com | oppenheimer01 | HashData |
-| Kirill Reshke | reshkekirill@gmail.com | reshke  | Yandex Cloud | Yandex Cloud |
+| Greg Spiegelberg | gspiegelberg@apache.org | gspiegelberg | MNTN |
+| Hao Wu | gfphoenix78@apache.org | gfphoenix78 | HashData |
+| Hope Gao | gaoxueyu@apache.org | gaoxueyu | HighGo |
+| Jianghua Yang | yjhjstz@apache.org | yjhjstz | HashData |
+| Jiaqi Zhou | jiaqizho@apache.org | jiaqizho | Zilliz |
+| Jinbao Chen | chenjinbao1989@apache.org | oppenheimer01 | HashData |
+| Kirill Reshke | reshke@apache.org | reshke  | Yandex Cloud | Yandex Cloud |
 | Kent Yao *(Mentor)* | yao@apache.org | yaooqinn | Apache Member, NetEase |
-| Louis Mugnano | lmugnano297@gmail.com | lmugnano4537 | Individual |
-| Max Yang | maxyang128@gmail.com | my-ship-it | HashData |
-| Maxim Smyatkin | smyatkinmaxim@gmail.com | Smyatkin-Maxim | Yandex Cloud |
+| Louis Mugnano | lmugnano@apache.org | lmugnano4537 | Individual |
+| Max Yang | maxyang@apache.org | my-ship-it | HashData |
+| Maxim Smyatkin | smyatkin@apache.org | Smyatkin-Maxim | Yandex Cloud |
 | Roman Shaposhnik *(Mentor)* | rvs@apache.org | rvs | Ainekko |
-| Sen Hu | husen.xjtu@gmail.com | HuSen8891 | HashData |
-| Shine Zhang | xinzweb@hotmail.com | xinzweb | Synx Data Labs |
-| Tushar Pednekar | tushar.pednekar@gmail.com | 2shar-p | Synx Data Labs |
-| Weinan WANG | wang.wn827@gmail.com | weinan003 | HashData |
-| Willem Jiang *(Mentor)*|ningjiang@apache.org | WillemJiang | Apache Member, ByteDance |
-| Xiaoran Wang | fanfuxiaoran@gmail.com | fanfuxiaoran | ByteDance |
-| Xin (Alwin) Tang | xtang.code@gmail.com | xtangcode | HashData |
-| Zhang Mingli | avamingli@gmail.com | avamingli | HashData |
+| Sen Hu | senhu@apache.org | HuSen8891 | HashData |
+| Shine Zhang | zhang75033us@apache.org | xinzweb | Synx Data Labs |
+| Tushar Pednekar | tushar_pednekar@apache.org | 2shar-p | Synx Data Labs |
+| Weinan WANG | wangwn@apache.org | weinan003 | HashData |
+| Willem Jiang *(Mentor)*| ningjiang@apache.org | WillemJiang | Apache Member, ByteDance |
+| Xiaoran Wang | fanfuxiaoran@apache.org | fanfuxiaoran | ByteDance |
+| Xin (Alwin) Tang | alwintang@apache.org | xtangcode | HashData |
+| Zhang Mingli | avamingli@apache.org | avamingli | HashData |
 
 ## Committers