diff --git a/charts/argo-cd/templates/argocd-ssh-known-hosts-cm.yaml b/charts/argo-cd/templates/argocd-ssh-known-hosts-cm.yaml
index ab62930f..84aeb7d5 100644
--- a/charts/argo-cd/templates/argocd-ssh-known-hosts-cm.yaml
+++ b/charts/argo-cd/templates/argocd-ssh-known-hosts-cm.yaml
@@ -11,9 +11,9 @@ data:
 kind: ConfigMap
 metadata:
   labels:
-    app.kubernetes.io/name: argocd-ssh-known-hosts-cm
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
+    app.kubernetes.io/part-of: argocd
   name: argocd-ssh-known-hosts-cm
diff --git a/charts/argo-cd/templates/argocd-tls-certs-cm.yaml b/charts/argo-cd/templates/argocd-tls-certs-cm.yaml
index c12fcb82..602879af 100644
--- a/charts/argo-cd/templates/argocd-tls-certs-cm.yaml
+++ b/charts/argo-cd/templates/argocd-tls-certs-cm.yaml
@@ -3,9 +3,9 @@ data: null
 kind: ConfigMap
 metadata:
   labels:
-    app.kubernetes.io/name: argocd-tls-certs-cm
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
+    app.kubernetes.io/part-of: argocd
   name: argocd-tls-certs-cm