diff --git a/charts/base-cluster/ci/flux-gitrepositories-gen-values.sh b/charts/base-cluster/ci/flux-gitrepositories-gen-values.sh
index eb04bc1dd..b64e64a57 100755
--- a/charts/base-cluster/ci/flux-gitrepositories-gen-values.sh
+++ b/charts/base-cluster/ci/flux-gitrepositories-gen-values.sh
@@ -7,7 +7,7 @@ set -o pipefail
 
 i=0
 for url in 'url="https://github.com"' 'url="ssh://git@github.com/group/name.git"'; do
-  for path in 'path="prod"' ''; do
+  for path in 'path="prod"' 'path="{{ .global.clusterName }}"' ''; do
     for extra in 'branch="main"' 'commit="549aee1"' 'semver="1.0.0"' 'tag="2.0.1"' ''; do
       for decr in 'decryption={provider:"sops"}' ''; do
         for auth in 'username="user" | .password="pass"' ''; do
diff --git a/charts/base-cluster/templates/flux/flux.yaml b/charts/base-cluster/templates/flux/flux.yaml
index 4d4d9d495..abcfe070a 100644
--- a/charts/base-cluster/templates/flux/flux.yaml
+++ b/charts/base-cluster/templates/flux/flux.yaml
@@ -82,7 +82,7 @@ spec:
     name: {{ printf "%s-flux-%s" (include "common.names.fullname" $) $name }}
     namespace: {{ $.Release.Namespace }}
   {{- if $instance.path }}
-  path: {{ include "common.tplvalues.render" (dict "value" $instance.path "context" $) | quote }}
+  path: {{ include "common.tplvalues.render" (dict "value" $instance.path "context" $.Values) | quote }}
   {{- end }}
   {{- if $instance.decryption }}
   decryption: