diff --git a/bitnami/argo-cd/CHANGELOG.md b/bitnami/argo-cd/CHANGELOG.md
index 5d8af293867ed2..04fda106be2b37 100644
--- a/bitnami/argo-cd/CHANGELOG.md
+++ b/bitnami/argo-cd/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 7.0.8 (2024-08-28)
+## 7.0.9 (2024-09-04)
 
-* [bitnami/argo-cd] Release 7.0.8 ([#29074](https://github.com/bitnami/charts/pull/29074))
+* [bitnami/argo-cd] Missing namespace in ArgoCD known-hosts cm ([#28877](https://github.com/bitnami/charts/pull/28877))
+
+## <small>7.0.8 (2024-08-28)</small>
+
+* [bitnami/argo-cd] Release 7.0.8 (#29074) ([cb56c0e](https://github.com/bitnami/charts/commit/cb56c0ed43ffc75df71571dd2e032dadfaa9face)), closes [#29074](https://github.com/bitnami/charts/issues/29074)
 
 ## <small>7.0.7 (2024-08-27)</small>
 
diff --git a/bitnami/argo-cd/Chart.yaml b/bitnami/argo-cd/Chart.yaml
index b586a109a96d04..57a83e841dd969 100644
--- a/bitnami/argo-cd/Chart.yaml
+++ b/bitnami/argo-cd/Chart.yaml
@@ -39,4 +39,4 @@ maintainers:
 name: argo-cd
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/argo-cd
-version: 7.0.8
+version: 7.0.9
diff --git a/bitnami/argo-cd/templates/known-hosts-cm.yaml b/bitnami/argo-cd/templates/known-hosts-cm.yaml
index c9e3a826062625..b1c13e9fe6b56f 100644
--- a/bitnami/argo-cd/templates/known-hosts-cm.yaml
+++ b/bitnami/argo-cd/templates/known-hosts-cm.yaml
@@ -10,6 +10,7 @@ metadata:
   # Mandatory hardcoded name.
   # Ref: https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#ssh-known-host-public-keys
   name: argocd-ssh-known-hosts-cm
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     # Mandatory label
     # Ref: https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#atomic-configuration