diff --git a/.github/workflows/claude-live-test.yml b/.github/workflows/claude-live-test.yml
old mode 100644
new mode 100755
index 95e15d939..4799bad32
--- a/.github/workflows/claude-live-test.yml
+++ b/.github/workflows/claude-live-test.yml
@@ -83,7 +83,7 @@ jobs:
           -f components/operator/Dockerfile components/operator
 
         docker build -t quay.io/ambient_code/vteam_claude_runner:claude-test \
-          -f components/runners/ambient-runner/Dockerfile components/runners
+          components/runners/ambient-runner
 
         echo "✅ All images built"
 
diff --git a/.github/workflows/components-build-deploy.yml b/.github/workflows/components-build-deploy.yml
old mode 100644
new mode 100755
index b6e6624e7..6e3887cfc
--- a/.github/workflows/components-build-deploy.yml
+++ b/.github/workflows/components-build-deploy.yml
@@ -51,7 +51,7 @@ jobs:
             {"name":"frontend","context":"./components/frontend","image":"quay.io/ambient_code/vteam_frontend","dockerfile":"./components/frontend/Dockerfile"},
             {"name":"backend","context":"./components/backend","image":"quay.io/ambient_code/vteam_backend","dockerfile":"./components/backend/Dockerfile"},
             {"name":"operator","context":"./components/operator","image":"quay.io/ambient_code/vteam_operator","dockerfile":"./components/operator/Dockerfile"},
-            {"name":"ambient-runner","context":"./components/runners","image":"quay.io/ambient_code/vteam_claude_runner","dockerfile":"./components/runners/ambient-runner/Dockerfile"},
+            {"name":"ambient-runner","context":"./components/runners/ambient-runner","image":"quay.io/ambient_code/vteam_claude_runner","dockerfile":"./components/runners/ambient-runner/Dockerfile"},
             {"name":"state-sync","context":"./components/runners/state-sync","image":"quay.io/ambient_code/vteam_state_sync","dockerfile":"./components/runners/state-sync/Dockerfile"},
             {"name":"public-api","context":"./components/public-api","image":"quay.io/ambient_code/vteam_public_api","dockerfile":"./components/public-api/Dockerfile"},
             {"name":"ambient-api-server","context":"./components/ambient-api-server","image":"quay.io/ambient_code/vteam_api_server","dockerfile":"./components/ambient-api-server/Dockerfile"}
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
old mode 100644
new mode 100755
index df89780b2..b485b40a6
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -135,8 +135,7 @@ jobs:
         if [ "${{ needs.detect-changes.outputs.claude-runner }}" == "true" ]; then
           echo "Building ambient-runner (changed)..."
           docker build -t quay.io/ambient_code/vteam_claude_runner:e2e-test \
-            -f components/runners/ambient-runner/Dockerfile \
-            components/runners
+            components/runners/ambient-runner
         else
           echo "Claude-runner unchanged, pulling latest..."
           docker pull quay.io/ambient_code/vteam_claude_runner:latest
diff --git a/.github/workflows/prod-release-deploy.yaml b/.github/workflows/prod-release-deploy.yaml
old mode 100644
new mode 100755
index 0f56b8d3e..5ad67d1f9
--- a/.github/workflows/prod-release-deploy.yaml
+++ b/.github/workflows/prod-release-deploy.yaml
@@ -212,7 +212,7 @@ jobs:
             {"name":"frontend","context":"./components/frontend","image":"quay.io/ambient_code/vteam_frontend","dockerfile":"./components/frontend/Dockerfile"},
             {"name":"backend","context":"./components/backend","image":"quay.io/ambient_code/vteam_backend","dockerfile":"./components/backend/Dockerfile"},
             {"name":"operator","context":"./components/operator","image":"quay.io/ambient_code/vteam_operator","dockerfile":"./components/operator/Dockerfile"},
-            {"name":"ambient-runner","context":"./components/runners","image":"quay.io/ambient_code/vteam_claude_runner","dockerfile":"./components/runners/ambient-runner/Dockerfile"},
+            {"name":"ambient-runner","context":"./components/runners/ambient-runner","image":"quay.io/ambient_code/vteam_claude_runner","dockerfile":"./components/runners/ambient-runner/Dockerfile"},
             {"name":"state-sync","context":"./components/runners/state-sync","image":"quay.io/ambient_code/vteam_state_sync","dockerfile":"./components/runners/state-sync/Dockerfile"},
             {"name":"public-api","context":"./components/public-api","image":"quay.io/ambient_code/vteam_public_api","dockerfile":"./components/public-api/Dockerfile"},
             {"name":"ambient-api-server","context":"./components/ambient-api-server","image":"quay.io/ambient_code/vteam_api_server","dockerfile":"./components/ambient-api-server/Dockerfile"}
diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
index 15defbbcc..9cdd982fd
--- a/Makefile
+++ b/Makefile
@@ -185,8 +185,8 @@ build-operator: ## Build operator image
 
 build-runner: ## Build Claude Code runner image
 	@echo "$(COLOR_BLUE)▶$(COLOR_RESET) Building runner with $(CONTAINER_ENGINE)..."
-	@cd components/runners && $(CONTAINER_ENGINE) build $(PLATFORM_FLAG) $(BUILD_FLAGS) \
-		-t $(RUNNER_IMAGE) -f ambient-runner/Dockerfile .
+	@cd components/runners/ambient-runner && $(CONTAINER_ENGINE) build $(PLATFORM_FLAG) $(BUILD_FLAGS) \
+		-t $(RUNNER_IMAGE) .
 	@echo "$(COLOR_GREEN)✓$(COLOR_RESET) Runner built: $(RUNNER_IMAGE)"
 
 build-state-sync: ## Build state-sync image for S3 persistence
diff --git a/components/runners/ambient-runner/Dockerfile b/components/runners/ambient-runner/Dockerfile
index d95d0c679..96899768a 100755
--- a/components/runners/ambient-runner/Dockerfile
+++ b/components/runners/ambient-runner/Dockerfile
@@ -29,7 +29,7 @@ RUN pip3 install --break-system-packages --no-cache-dir uv==${UV_VERSION} pre-co
 WORKDIR /app
 
 # Copy ambient-runner package
-COPY ambient-runner /app/ambient-runner
+COPY . /app/ambient-runner
 
 # Install runner as a package, then remove build-only deps in same layer
 RUN pip3 install --break-system-packages --no-cache-dir '/app/ambient-runner[all]' && \