diff --git a/bin/disinto b/bin/disinto
index 98cb2fe..62081c5 100755
--- a/bin/disinto
+++ b/bin/disinto
@@ -843,10 +843,10 @@ _disinto_init_nomad() {
         echo "[build] [dry-run] docker build -t disinto/agents:local -f ${FACTORY_ROOT}/docker/agents/Dockerfile ${FACTORY_ROOT}"
       fi
       if echo ",$with_services," | grep -q ",chat,"; then
-        echo "[build] [dry-run] docker build -t disinto/chat:local -f ${FACTORY_ROOT}/docker/chat/Dockerfile ${FACTORY_ROOT}"
+        echo "[build] [dry-run] docker build -t disinto/chat:local -f ${FACTORY_ROOT}/docker/chat/Dockerfile ${FACTORY_ROOT}/docker/chat"
       fi
       if echo ",$with_services," | grep -q ",edge,"; then
-        echo "[build] [dry-run] docker build -t disinto/edge:local -f ${FACTORY_ROOT}/docker/edge/Dockerfile ${FACTORY_ROOT}"
+        echo "[build] [dry-run] docker build -t disinto/edge:local -f ${FACTORY_ROOT}/docker/edge/Dockerfile ${FACTORY_ROOT}/docker/edge"
       fi
     fi
     exit 0
@@ -950,12 +950,12 @@ _disinto_init_nomad() {
     if echo ",$with_services," | grep -q ",chat,"; then
       local tag="disinto/chat:local"
       echo "── Building $tag ─────────────────────────────"
-      docker build -t "$tag" -f "${FACTORY_ROOT}/docker/chat/Dockerfile" "${FACTORY_ROOT}" 2>&1 | tail -5
+      docker build -t "$tag" -f "${FACTORY_ROOT}/docker/chat/Dockerfile" "${FACTORY_ROOT}/docker/chat" 2>&1 | tail -5
     fi
     if echo ",$with_services," | grep -q ",edge,"; then
       local tag="disinto/edge:local"
       echo "── Building $tag ─────────────────────────────"
-      docker build -t "$tag" -f "${FACTORY_ROOT}/docker/edge/Dockerfile" "${FACTORY_ROOT}" 2>&1 | tail -5
+      docker build -t "$tag" -f "${FACTORY_ROOT}/docker/edge/Dockerfile" "${FACTORY_ROOT}/docker/edge" 2>&1 | tail -5
     fi
   fi
 
diff --git a/nomad/jobs/agents.hcl b/nomad/jobs/agents.hcl
index 7ecc564..92d377e 100644
--- a/nomad/jobs/agents.hcl
+++ b/nomad/jobs/agents.hcl
@@ -152,37 +152,44 @@ FORGE_PASS={{ .Data.data.pass }}
 FORGE_TOKEN=seed-me
 FORGE_PASS=seed-me
 {{- end }}
-{{- with secret "kv/data/disinto/bots/review" -}}
+
+{{ with secret "kv/data/disinto/bots/review" -}}
 FORGE_REVIEW_TOKEN={{ .Data.data.token }}
 {{- else -}}
 FORGE_REVIEW_TOKEN=seed-me
 {{- end }}
-{{- with secret "kv/data/disinto/bots/gardener" -}}
+
+{{ with secret "kv/data/disinto/bots/gardener" -}}
 FORGE_GARDENER_TOKEN={{ .Data.data.token }}
 {{- else -}}
 FORGE_GARDENER_TOKEN=seed-me
 {{- end }}
-{{- with secret "kv/data/disinto/bots/architect" -}}
+
+{{ with secret "kv/data/disinto/bots/architect" -}}
 FORGE_ARCHITECT_TOKEN={{ .Data.data.token }}
 {{- else -}}
 FORGE_ARCHITECT_TOKEN=seed-me
 {{- end }}
-{{- with secret "kv/data/disinto/bots/planner" -}}
+
+{{ with secret "kv/data/disinto/bots/planner" -}}
 FORGE_PLANNER_TOKEN={{ .Data.data.token }}
 {{- else -}}
 FORGE_PLANNER_TOKEN=seed-me
 {{- end }}
-{{- with secret "kv/data/disinto/bots/predictor" -}}
+
+{{ with secret "kv/data/disinto/bots/predictor" -}}
 FORGE_PREDICTOR_TOKEN={{ .Data.data.token }}
 {{- else -}}
 FORGE_PREDICTOR_TOKEN=seed-me
 {{- end }}
-{{- with secret "kv/data/disinto/bots/supervisor" -}}
+
+{{ with secret "kv/data/disinto/bots/supervisor" -}}
 FORGE_SUPERVISOR_TOKEN={{ .Data.data.token }}
 {{- else -}}
 FORGE_SUPERVISOR_TOKEN=seed-me
 {{- end }}
-{{- with secret "kv/data/disinto/bots/vault" -}}
+
+{{ with secret "kv/data/disinto/bots/vault" -}}
 FORGE_VAULT_TOKEN={{ .Data.data.token }}
 {{- else -}}
 FORGE_VAULT_TOKEN=seed-me
diff --git a/nomad/jobs/vault-runner.hcl b/nomad/jobs/vault-runner.hcl
index f7b9aed..6f174a3 100644
--- a/nomad/jobs/vault-runner.hcl
+++ b/nomad/jobs/vault-runner.hcl
@@ -94,27 +94,32 @@ GITHUB_TOKEN={{ .Data.data.value }}
 {{- else -}}
 GITHUB_TOKEN=
 {{- end }}
-{{- with secret "kv/data/disinto/runner/CODEBERG_TOKEN" -}}
+
+{{ with secret "kv/data/disinto/runner/CODEBERG_TOKEN" -}}
 CODEBERG_TOKEN={{ .Data.data.value }}
 {{- else -}}
 CODEBERG_TOKEN=
 {{- end }}
-{{- with secret "kv/data/disinto/runner/CLAWHUB_TOKEN" -}}
+
+{{ with secret "kv/data/disinto/runner/CLAWHUB_TOKEN" -}}
 CLAWHUB_TOKEN={{ .Data.data.value }}
 {{- else -}}
 CLAWHUB_TOKEN=
 {{- end }}
-{{- with secret "kv/data/disinto/runner/DEPLOY_KEY" -}}
+
+{{ with secret "kv/data/disinto/runner/DEPLOY_KEY" -}}
 DEPLOY_KEY={{ .Data.data.value }}
 {{- else -}}
 DEPLOY_KEY=
 {{- end }}
-{{- with secret "kv/data/disinto/runner/NPM_TOKEN" -}}
+
+{{ with secret "kv/data/disinto/runner/NPM_TOKEN" -}}
 NPM_TOKEN={{ .Data.data.value }}
 {{- else -}}
 NPM_TOKEN=
 {{- end }}
-{{- with secret "kv/data/disinto/runner/DOCKER_HUB_TOKEN" -}}
+
+{{ with secret "kv/data/disinto/runner/DOCKER_HUB_TOKEN" -}}
 DOCKER_HUB_TOKEN={{ .Data.data.value }}
 {{- else -}}
 DOCKER_HUB_TOKEN=