diff --git a/.github/actions/start-services/action.yml b/.github/actions/start-services/action.yml
index bc8745b540..c180b20406 100644
--- a/.github/actions/start-services/action.yml
+++ b/.github/actions/start-services/action.yml
@@ -26,6 +26,13 @@ inputs:
     description: "Disable memfd-backed guest memory (on by default)"
     required: false
     default: "false"
+  orchestrator-make-path:
+    description: |
+      Directory whose Makefile starts the orchestrator (run-debug target).
+      Lets callers substitute a compatible orchestrator build from a
+      different directory.
+    required: false
+    default: "packages/orchestrator"
 
 runs:
   using: "composite"
@@ -110,6 +117,7 @@ runs:
         COMPRESS_FRAME_ENCODE_WORKERS: ${{ inputs.compress_workers }}
         TESTS_MEMFILE_DIFF_DEDUP_MODE: ${{ inputs.dedup_mode }}
         TESTS_DISABLE_MEMFD: ${{ inputs.disable_memfd }}
+        ORCHESTRATOR_MAKE_PATH: ${{ inputs.orchestrator-make-path }}
         E2B_DEBUG: "true"
       run: |
         mkdir -p $SHARED_CHUNK_CACHE_PATH
@@ -134,7 +142,7 @@ runs:
 
 
         echo "Start orchestrator"
-        ./scripts/start-service.sh "Orchestrator" packages/orchestrator run-debug ~/logs/orchestrator.log http://localhost:5008/health
+        ./scripts/start-service.sh "Orchestrator" "${ORCHESTRATOR_MAKE_PATH}" run-debug ~/logs/orchestrator.log http://localhost:5008/health
 
         echo "Start API"
         STARTUP_TIMEOUT=60 ./scripts/start-service.sh "API" packages/api run ~/logs/api.log http://localhost:3000/health
diff --git a/packages/local-dev/.gitignore b/packages/local-dev/.gitignore
index 61e2058fe4..0b7acf85eb 100644
--- a/packages/local-dev/.gitignore
+++ b/packages/local-dev/.gitignore
@@ -1 +1,4 @@
 clickhouse-config-generated.xml
+
+# Remove go build binary
+/local-dev
diff --git a/packages/local-dev/local-dev b/packages/local-dev/local-dev
deleted file mode 100755
index ff65e3a027..0000000000
Binary files a/packages/local-dev/local-dev and /dev/null differ
diff --git a/scripts/get-latest-migration.sh b/scripts/get-latest-migration.sh
index 9498caf870..3b0f6ad252 100755
--- a/scripts/get-latest-migration.sh
+++ b/scripts/get-latest-migration.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 set -euo pipefail
 
-cd "$(git rev-parse --show-toplevel)"
+# Read the migrations from the filesystem, not from git: this script also
+# runs where git metadata is absent or points at a different tree (docker
+# build contexts, CI workspaces assembled from a subdirectory).
+cd "$(dirname "$0")/.."
 
-latest_version=$(git ls-tree --name-only HEAD -- packages/db/migrations/ | sed 's|.*/||' | sed 's/_.*//' | sort | tail -n 1)
-echo "$latest_version"
\ No newline at end of file
+latest_version=$(ls packages/db/migrations/ | sed 's/_.*//' | sort | tail -n 1)
+echo "$latest_version"