diff --git a/lib/init/nomad/deploy.sh b/lib/init/nomad/deploy.sh
index a1724c5..7cf9278 100755
--- a/lib/init/nomad/deploy.sh
+++ b/lib/init/nomad/deploy.sh
@@ -177,7 +177,8 @@ for job_name in "${JOBS[@]}"; do
   fi
 
   # Per-job timeout override: JOB_READY_TIMEOUT_<UPPERCASE_JOBNAME>
-  job_upper=$(printf '%s' "$job_name" | tr '[:lower:]' '[:upper:]')
+  # Sanitize job name: replace hyphens with underscores (bash vars can't have hyphens)
+  job_upper=$(printf '%s' "$job_name" | tr '[:lower:]-' '[:upper:]_' | tr ' ' '_')
   timeout_var="JOB_READY_TIMEOUT_${job_upper}"
   job_timeout="${!timeout_var:-$JOB_READY_TIMEOUT_SECS}"
 
diff --git a/lib/init/nomad/wp-oauth-register.sh b/lib/init/nomad/wp-oauth-register.sh
index 9b7f12a..6d2a4cd 100755
--- a/lib/init/nomad/wp-oauth-register.sh
+++ b/lib/init/nomad/wp-oauth-register.sh
@@ -44,7 +44,7 @@ set -euo pipefail
 # Source the hvault module for Vault helpers
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_ROOT="$(cd "${SCRIPT_DIR}/../.." && pwd)"
-# shellcheck source=../../lib/hvault.sh
+# shellcheck source=../../../lib/hvault.sh
 source "${REPO_ROOT}/lib/hvault.sh"
 
 # Configuration