diff --git a/CODEOWNERS b/CODEOWNERS
index 4de97a08..76273d1e 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,4 +2,10 @@
 # Each line is a file pattern followed by one or more owners,
 # the last matching pattern has the most precendence.
 
-* @bajtos @fabien @clarkorz @ebarault @lehni @zbarbuto
+# Current maintainers
+
+* @bajtos @fabien @clarkorz @ebarault @zbarbuto
+
+# Alumni
+
+_ @lehni