diff --git a/helmfile.d/system.yaml.gotmpl b/helmfile.d/system.yaml.gotmpl
index f1e5b046..e0fbeb28 100644
--- a/helmfile.d/system.yaml.gotmpl
+++ b/helmfile.d/system.yaml.gotmpl
@@ -24,9 +24,9 @@ releases:
     - '{{`{{ .Environment.Name }}`}}'
     - ../values/system/manifests
     - manifests
-- name: manifests
+- name: {{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}-manifests
   namespace: kube-system
-  chart: manifests
+  chart: {{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}-manifests
   missingFileHandler: Info
   values:
   - ../values/env.yaml
@@ -42,5 +42,5 @@ releases:
     - '{{`{{ .Release.Chart }}`}}'
     - '{{`{{ .Environment.Name }}`}}'
     - ../values/system/{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}
-    - manifests
+    - {{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}-manifests