diff --git a/CODEOWNERS b/.github/CODEOWNERS
similarity index 68%
rename from CODEOWNERS
rename to .github/CODEOWNERS
index f7432a77..05c993b9 100644
--- a/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,14 +1,6 @@
-# All
-*                              @mkilchhofer @jmeridth
+* @mkilchhofer @jmeridth @yu-croco
 
-# Argo Workflows
 /charts/argo-workflows/        @vladlosev @jmeridth @yu-croco @tico24
-
-# Argo CD
 /charts/argo-cd/               @mbevc1 @mkilchhofer @yu-croco @jmeridth @pdrastil @tico24
-
-# Argo Events
 /charts/argo-events/           @pdrastil @jmeridth @tico24
-
-# Argo Rollouts
 /charts/argo-rollouts/         @jmeridth