diff --git a/MAINTAINERS b/MAINTAINERS
index 7f697bfa193..07ea5f5b6e1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -729,7 +729,7 @@ Yao Qi                          qiyao           <yao@codesourcery.com>
 Xianmiao Qu                     -               <cooper.qu@linux.alibaba.com>
 Jerry Quinn                     jlquinn         <jlquinn@optonline.net>
 Ramana Radhakrishnan            ramana          <ramanara@nvidia.com>
-Navid Rahimi                    navidr          <navidrahimi@microsoft.com>
+Navid Rahimi                    navidr          <navidr@gcc.gnu.org>
 Rishi Raj                       -               <rishiraj45035@gmail.com>
 Easwaran Raman                  eraman          <eraman@google.com>
 Joe Ramsay                      joeramsay       <joe.ramsay@arm.com>
@@ -930,7 +930,7 @@ Gaius Mulley                                    <gaiusmod2@gmail.com>
 Andrew Pinski                                   <quic_apinski@quicinc.com>
 Siddhesh Poyarekar                              <siddhesh@gotplt.org>
 Ramana Radhakrishnan                            <ramanara@nvidia.com>
-Navid Rahimi                                    <navidrahimi@microsoft.com>
+Navid Rahimi                                    <navidr@gcc.gnu.org>
 Rishi Raj                                       <rishiraj45035@gmail.com>
 Trevor Saunders                                 <tbsaunde+gcc@tbsaunde.org>
 Bill Schmidt                                    <bill.schmidt@fastmail.com>