diff --git a/scripts/build.sh b/scripts/build.sh
index 72f3973..2fe6032 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -138,6 +138,14 @@ function setup_build_environment() {
     log_info "Kernel version: ${KERNEL_VERSION}"
     log_info "Rust target: ${RUST_TARGET}"
     log_info "Optimization level: ${OPTIMIZATION_LEVEL}"
+
+    # Ensure a stable CWD inside the container (prefer /workspace)
+    if in_container; then
+        if [[ "$(pwd)" != "${PROJECT_ROOT}" ]]; then
+            log_info "Ensuring container CWD=${PROJECT_ROOT}"
+            safe_execute cd "${PROJECT_ROOT}"
+        fi
+    fi
     
     # Create build directories only if we're in container
     # Host will let container create them to avoid permission issues