diff --git a/clusters/prod/apps.yaml b/clusters/prod/apps.yaml
index c90d35f..9a6ac82 100644
--- a/clusters/prod/apps.yaml
+++ b/clusters/prod/apps.yaml
@@ -12,6 +12,7 @@ spec:
     kind: GitRepository
     name: flux-system
   dependsOn:
+    - name: cluster-vars
     - name: infrastructure-configs
   decryption:
     provider: sops
diff --git a/clusters/prod/infrastructure.yaml b/clusters/prod/infrastructure.yaml
index bb04175..c2b48f0 100644
--- a/clusters/prod/infrastructure.yaml
+++ b/clusters/prod/infrastructure.yaml
@@ -9,8 +9,6 @@ spec:
   interval: 10m0s
   path: ./infrastructure/core
   prune: true
-  dependsOn:
-    - name: cluster-vars
   sourceRef:
     kind: GitRepository
     name: flux-system
@@ -28,7 +26,12 @@ spec:
     kind: GitRepository
     name: flux-system
   dependsOn:
+    - name: cluster-vars
     - name: infrastructure-core
+  postBuild:
+    substituteFrom:
+      - kind: Secret
+        name: cluster-vars-prod
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
@@ -43,6 +46,7 @@ spec:
     kind: GitRepository
     name: flux-system
   dependsOn:
+    - name: cluster-vars
     - name: infrastructure-controllers
   decryption:
     provider: sops