diff --git a/CODEOWNERS b/CODEOWNERS
index acd42f9b..7627dc16 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,13 +1,13 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
-# All charts
-/charts/ @mkilchhofer @oliverbaehler
+# Other and new charts
+/charts/ @oliverbaehler
 
 # Argo Workflows
 /charts/argo-workflows/ @stefansedich @paguos @vladlosev @yann-soubeyrand 
 
 # Argo CD
-/charts/argo-cd/ @davidkarlsen @mr-sour @yann-soubeyrand @mbevc1
+/charts/argo-cd/ @davidkarlsen @mr-sour @yann-soubeyrand @mbevc1 @mkilchhofer
 
 # Argo Events
 /charts/argo-events/ @jbehling @VaibhavPage