diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 444b77899be1..62e3e9004a8c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9205,6 +9205,11 @@
     github = "gytis-ivaskevicius";
     githubId = 23264966;
   };
+  GZGavinZhao = {
+    name = "Gavin Zhao";
+    github = "GZGavinZhao";
+    githubId = 74938940;
+  };
   h3cth0r = {
     name = "Hector Miranda";
     email = "hector.miranda@tec.mx";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 65fc6ca54edd..199e2ff4f751 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -1018,8 +1018,9 @@ with lib.maintainers;
 
   rocm = {
     members = [
-      Madouura
       Flakebi
+      GZGavinZhao
+      LunNova
       mschwaig
     ];
     githubTeams = [ "rocm-maintainers" ];