diff --git a/root/templates/cluster-forge.yaml b/root/templates/cluster-forge.yaml
index bcaa2620..ce7cee38 100644
--- a/root/templates/cluster-forge.yaml
+++ b/root/templates/cluster-forge.yaml
@@ -18,10 +18,10 @@ spec:
       valueFiles:
         - {{ .Values.externalValues.path }}
         - {{ .Values.global.clusterSize }}
-        - $values/values.yaml
+        - $cluster-values/values.yaml
   - repoURL: {{ .Values.externalValues.repoUrl }}
     targetRevision: {{ .Values.externalValues.targetRevision }}
-    ref: values
+    ref: cluster-values
   {{ else }}
   # helm-chart & values file within the same git repo
   source:
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index e8991cc6..63cc36a5 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -270,12 +270,10 @@ helm template --release-name openbao ${SCRIPT_DIR}/../sources/openbao/0.18.2 --n
   --kube-version=${KUBE_VERSION} | kubectl apply --server-side --field-manager=argocd-controller --force-conflicts -f -
 kubectl wait --for=jsonpath='{.status.phase}'=Running pod/openbao-0 -n cf-openbao --timeout=100s
 
-# Create static ConfigMaps needed for init job
-echo "Creating OpenBao config static resources..."
-helm template --release-name openbao-config-static ${SCRIPT_DIR}/init-openbao-job \
-  --set domain="${DOMAIN}" \
-  --kube-version=${KUBE_VERSION} \
-  --show-only templates/openbao-secret-manager-cm.yaml | kubectl apply -f -
+# Create initial secrets config for init job (separate from ArgoCD-managed version)
+echo "Creating initial OpenBao secrets configuration..."
+cat ${SCRIPT_DIR}/../sources/openbao-config/0.1.0/templates/openbao-secret-manager-cm.yaml | \
+  sed "s|name: openbao-secret-manager-scripts|name: openbao-secret-manager-scripts-init|g" | kubectl apply -f -
 
 # Create initial secrets config for init job (separate from ArgoCD-managed version)
 echo "Creating initial OpenBao secrets configuration..."
diff --git a/scripts/init-openbao-job/templates/cf-init-openbao-job.yaml b/scripts/init-openbao-job/templates/cf-init-openbao-job.yaml
index 8bc6a729..31f0d6f7 100644
--- a/scripts/init-openbao-job/templates/cf-init-openbao-job.yaml
+++ b/scripts/init-openbao-job/templates/cf-init-openbao-job.yaml
@@ -55,5 +55,5 @@ spec:
             name: openbao-secrets-init-config
         - name: secret-manager
           configMap:
-            name: openbao-secret-manager-scripts
+            name: openbao-secret-manager-scripts-init
             defaultMode: 0755
diff --git a/scripts/init-openbao-job/templates/openbao-secret-manager-cm.yaml b/sources/openbao-config/0.1.0/templates/openbao-secret-manager-cm.yaml
similarity index 100%
rename from scripts/init-openbao-job/templates/openbao-secret-manager-cm.yaml
rename to sources/openbao-config/0.1.0/templates/openbao-secret-manager-cm.yaml