diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 488aa960..9f18c219 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,8 +7,7 @@
 #    https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 # for more details.
 
-* alxiong philippecamacho sveitser
-/wallet/ jbearer shenkeyao
-/relayer/ nyospe
-/doc/ pictographer
-/.github/ Ancient123
+* @philippecamacho @sveitser
+/wallet/ @bfish713 @shenkeyao
+/eqs/ @nyospe
+/.github/ @Ancient123