diff --git a/CODEOWNERS b/CODEOWNERS
index bc572ce4..f35c9b71 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,16 +1,16 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
 # Argo Workflows
-/charts/argo @stefansedich @paguos @vladlosev @yann-soubeyrand
+/charts/argo @stefansedich @paguos @vladlosev @yann-soubeyrand @oliverbaehler
 
 # Argo CD
-/charts/argo-cd @seanson @spencergilbert @davidkarlsen @mr-sour @yann-soubeyrand
+/charts/argo-cd @seanson @spencergilbert @davidkarlsen @mr-sour @yann-soubeyrand @oliverbaehler
 
 # Argo Events
-/charts/argo-events @jbehling @VaibhavPage
+/charts/argo-events @jbehling @VaibhavPage @oliverbaehler
 
 # Argo Rollouts
-/charts/argo-rollouts @cabrinha
+/charts/argo-rollouts @cabrinha @oliverbaehler
 
 # Argo CD Notifications
-/charts/argocd-notifications @alexmt @andyfeller
+/charts/argocd-notifications @alexmt @andyfeller @oliverbaehler