diff --git a/project/flux-project-emeriti.yaml b/project/flux-project-emeriti.yaml
index b54affcf..70e83dfa 100644
--- a/project/flux-project-emeriti.yaml
+++ b/project/flux-project-emeriti.yaml
@@ -12,11 +12,15 @@ go-git-providers:
 - Dinos Kousidis
 - Michael Beaumont
 - Sara El-Zayat
+- Simon Howe
+- Yiannis Triantafyllopoulos
 helm-controller:
 - Sean Eagan
 helm-operator:
 - Alfonso Acosta
 - Michael Bridgen
+terraform-provider-flux:
+- Philip Laine
 website:
 - Alison Dowdney
 - Daniel Holbach
diff --git a/project/flux-project-maintainers.yaml b/project/flux-project-maintainers.yaml
index eb4db9e6..bfe6e4bb 100644
--- a/project/flux-project-maintainers.yaml
+++ b/project/flux-project-maintainers.yaml
@@ -18,10 +18,8 @@ flux2:
 - darkowlzz
 go-git-providers:
 - makkes
-- foot
 - souleb
 - stefanprodan
-- yiannistri
 image-automation-controller:
 # Plus flux2 maintainers
 - pjbgf
@@ -29,7 +27,6 @@ notification-controller:
 # Plus flux2 maintainers
 - somtochiama
 terraform-provider-flux:
-- phillebaba
 - stefanprodan
 website:
 - hiddeco
diff --git a/project/rolodex.yaml b/project/rolodex.yaml
index 392fcf19..4fd8a2c7 100644
--- a/project/rolodex.yaml
+++ b/project/rolodex.yaml
@@ -12,6 +12,8 @@ emeriti:
 - Philip Laine
 - Sara El-Zayat
 - Sean Eagan
+- Simon Howe
+- Yiannis Triantafyllopoulos
 maintainers:
 - aryan9600:
     name: Sanskar Jaiswal
@@ -23,11 +25,6 @@ maintainers:
     email: sunny@darkowlzz.space
     affiliation: Independent
     slack: darkowlzz
-- foot:
-    name: Simon Howe
-    email: simon@weave.works
-    affiliation: Weaveworks
-    slack: simonh
 - hiddeco:
     name: Hidde Beydals
     email: hidde@weave.works
@@ -58,11 +55,6 @@ maintainers:
     email: tamaonakahara@gmail.com
     affiliation: Independent
     slack: tamao
-- phillebaba:
-    name: Philip Laine
-    email: philip.laine@xenit.se
-    affiliation: Xenit
-    slack: phillebaba
 - pjbgf:
     name: Paulo Gomes
     email: pjbgf@linux.com
@@ -93,8 +85,3 @@ maintainers:
     email: stefan.prodan@gmail.com
     affiliation: ControlPlane
     slack: stefanprodan
-- yiannistri:
-    name: Yiannis Triantafyllopoulos
-    email: yiannis@weave.works
-    affiliation: Weaveworks
-    slack: yiannis