diff --git a/lib/init/nomad/deploy.sh b/lib/init/nomad/deploy.sh
index 7cf9278..f9a3805 100755
--- a/lib/init/nomad/deploy.sh
+++ b/lib/init/nomad/deploy.sh
@@ -16,7 +16,7 @@
 # Environment:
 #   REPO_ROOT              — absolute path to repo root (defaults to parent of
 #                            this script's parent directory)
-#   JOB_READY_TIMEOUT_SECS — poll timeout in seconds (default: 240)
+#   JOB_READY_TIMEOUT_SECS — poll timeout in seconds (default: 360)
 #   JOB_READY_TIMEOUT_<JOBNAME> — per-job timeout override (e.g.,
 #                            JOB_READY_TIMEOUT_FORGEJO=300)
 #
@@ -33,7 +33,7 @@ set -euo pipefail
 # ── Configuration ────────────────────────────────────────────────────────────
 SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_ROOT="${REPO_ROOT:-$(cd "${SCRIPT_ROOT}/../../.." && pwd)}"
-JOB_READY_TIMEOUT_SECS="${JOB_READY_TIMEOUT_SECS:-240}"
+JOB_READY_TIMEOUT_SECS="${JOB_READY_TIMEOUT_SECS:-360}"
 
 DRY_RUN=0
 
diff --git a/nomad/jobs/edge.hcl b/nomad/jobs/edge.hcl
index b1b2da4..f44176a 100644
--- a/nomad/jobs/edge.hcl
+++ b/nomad/jobs/edge.hcl
@@ -225,6 +225,21 @@ EOT
         read_only   = false
       }
 
+      # ── Forge URL via Nomad service discovery (issue #1034) ──────────
+      # Resolves forgejo service address/port dynamically for bridge network
+      # compatibility. Template-scoped to dispatcher task (Nomad doesn't
+      # propagate templates across tasks).
+      template {
+        destination = "local/forge.env"
+        env         = true
+        change_mode = "restart"
+        data        = <<EOT
+{{ range service "forgejo" -}}
+FORGE_URL=http://{{ .Address }}:{{ .Port }}
+{{- end }}
+EOT
+      }
+
       # ── Vault-templated secrets (S5.1, issue #988) ──────────────────────
       # Renders FORGE_TOKEN from Vault KV v2 for ops repo access.
       template {