diff --git a/project/flux-project-maintainers.yaml b/project/flux-project-maintainers.yaml
index 9ab335ad..84531f22 100644
--- a/project/flux-project-maintainers.yaml
+++ b/project/flux-project-maintainers.yaml
@@ -2,6 +2,7 @@ community:
 - kingdonb
 - scottrigby
 - stefanprodan
+- mewzherder
 flagger:
 - aryan9600
 - stefanprodan
diff --git a/project/rolodex.yaml b/project/rolodex.yaml
index 394d164a..8bf3b2da 100644
--- a/project/rolodex.yaml
+++ b/project/rolodex.yaml
@@ -39,19 +39,24 @@ maintainers:
     slack: Kingdon B
 - makkes:
     name: Max Jonas Werner
-    email: max@e13.dev
-    affiliation: Weaveworks
+    email: max.werner@associmates.eu
+    affiliation: Associmates
     slack: max
 - makkes:
     name: Max Jonas Werner
-    email: max.werner@associmates.eu
-    affiliation: Associmates
+    email: max@e13.dev
+    affiliation: Weaveworks
     slack: max
 - mathetake:
     name: Takeshi Yoneda
     email: takeshi@tetrate.io
     affiliation: Tetrate
     slack: mathetake
+- mewzherder:
+    name: Tamao Nakahara
+    email: tamaonakahara@gmail.com
+    affiliation: Independent
+    slack: tamao
 - phillebaba:
     name: Philip Laine
     email: philip.laine@xenit.se
@@ -85,7 +90,7 @@ maintainers:
 - stefanprodan:
     name: Stefan Prodan
     email: stefan.prodan@gmail.com
-    affiliation: Independent
+    affiliation: ControlPlane
     slack: stefanprodan
 - stefanprodan:
     name: Stefan Prodan