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
diff --git a/charts/argo-cd/.helmignore b/charts/argo-cd/.helmignore
index 2df6bf53..94c89570 100644
--- a/charts/argo-cd/.helmignore
+++ b/charts/argo-cd/.helmignore
@@ -1,2 +1,2 @@
-*.tgz
+/*.tgz
 output
diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 38c19b15..408fda4f 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.8.4
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.17.4
+version: 2.17.5
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords: