diff --git a/CODEOWNERS b/CODEOWNERS
index 4efe72e2..f4948246 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -3,8 +3,8 @@
 # the last matching pattern has the most precendence.
 
 # Current maintainers
-* @kjdelisle @jannyHou @loay @b-admike @ssh24 @virkt25 @dhmlau @zbarbuto @nitro404
+* @jannyHou @b-admike @virkt25 @dhmlau @shimks @zbarbuto @nitro404
 
 # Alumni
 #
-# @lehni
+# @lehni @kjdelisle @loay @ssh24