diff --git a/CODEOWNERS b/CODEOWNERS
index 4bba7d2..61ff871 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,3 +1,3 @@
 # CODEOWNERS for .project metadata repository
 # Changes to project metadata require maintainer review.
-* @EItanya @ilackarms @iplay88keys @jmhbh @peterj @supreme-gg-gg @yuval-k @christian-posta @linsun @dimetron @antweiss 
+* @artberger @dimetron @EItanya @ilackarms @linsun @Nadine2016 @peterj @yuval-k
diff --git a/maintainers.yaml b/maintainers.yaml
index 92c3589..c383772 100644
--- a/maintainers.yaml
+++ b/maintainers.yaml
@@ -8,14 +8,11 @@ maintainers:
     teams:
       - name: "project-maintainers"
         members:
+          - artberger
+          - dimetron
           - EItanya
           - ilackarms
-          - iplay88keys
-          - jmhbh
+          - linsun
+          - Nadine2016
           - peterj
-          - supreme-gg-gg
           - yuval-k
-          - christian-posta
-          - linsun
-          - dimetron
-          - antweiss