diff --git a/scripts/lib/docker-e2e-container.sh b/scripts/lib/docker-e2e-container.sh
index 2cdd796b7101..81bbe2f3159a 100644
--- a/scripts/lib/docker-e2e-container.sh
+++ b/scripts/lib/docker-e2e-container.sh
@@ -3,17 +3,27 @@
 # Shared helpers for Docker E2E scripts that keep a named container running
 # while polling readiness from the host.
 
-docker_e2e_docker_cmd() {
+docker_e2e_timeout_cmd() {
+  local timeout_value="$1"
+  shift
   if command -v timeout >/dev/null 2>&1; then
-    timeout "${DOCKER_COMMAND_TIMEOUT:-600s}" docker "$@"
+    if timeout --kill-after=1s 1s true >/dev/null 2>&1; then
+      timeout --kill-after=30s "$timeout_value" "$@"
+    else
+      timeout "$timeout_value" "$@"
+    fi
     return
   fi
-  docker "$@"
+  "$@"
+}
+
+docker_e2e_docker_cmd() {
+  docker_e2e_timeout_cmd "${DOCKER_COMMAND_TIMEOUT:-600s}" docker "$@"
 }
 
 docker_e2e_docker_run_cmd() {
-  if [ -n "${DOCKER_COMMAND_TIMEOUT:-}" ] && command -v timeout >/dev/null 2>&1; then
-    timeout "$DOCKER_COMMAND_TIMEOUT" docker "$@"
+  if [ -n "${DOCKER_COMMAND_TIMEOUT:-}" ]; then
+    docker_e2e_timeout_cmd "$DOCKER_COMMAND_TIMEOUT" docker "$@"
     return
   fi
   docker "$@"
diff --git a/scripts/lib/docker-e2e-package.sh b/scripts/lib/docker-e2e-package.sh
index e7721a830ec9..1695af36348c 100644
--- a/scripts/lib/docker-e2e-package.sh
+++ b/scripts/lib/docker-e2e-package.sh
@@ -15,8 +15,16 @@ if ! declare -F docker_e2e_docker_cmd >/dev/null 2>&1; then
 fi
 if ! declare -F docker_e2e_docker_run_cmd >/dev/null 2>&1; then
   docker_e2e_docker_run_cmd() {
+    if [ -n "${DOCKER_COMMAND_TIMEOUT:-}" ] && declare -F docker_e2e_timeout_cmd >/dev/null 2>&1; then
+      docker_e2e_timeout_cmd "$DOCKER_COMMAND_TIMEOUT" docker "$@"
+      return
+    fi
     if [ -n "${DOCKER_COMMAND_TIMEOUT:-}" ] && command -v timeout >/dev/null 2>&1; then
-      timeout "$DOCKER_COMMAND_TIMEOUT" docker "$@"
+      if timeout --kill-after=1s 1s true >/dev/null 2>&1; then
+        timeout --kill-after=30s "$DOCKER_COMMAND_TIMEOUT" docker "$@"
+      else
+        timeout "$DOCKER_COMMAND_TIMEOUT" docker "$@"
+      fi
       return
     fi
     docker "$@"
diff --git a/test/scripts/docker-build-helper.test.ts b/test/scripts/docker-build-helper.test.ts
index 96d675a491d5..ea9d9720caeb 100644
--- a/test/scripts/docker-build-helper.test.ts
+++ b/test/scripts/docker-build-helper.test.ts
@@ -182,8 +182,19 @@ export OPENCLAW_SKIP_DOCKER_BUILD=1
 mkdir -p "$TMPDIR/bin"
 cat >"$TMPDIR/bin/timeout" <<'SH'
 #!/usr/bin/env bash
-printf "%s|%s\\n" "$1" "$2 $3 $4" >>"$TMPDIR/timeout-seen"
-shift
+case "$1" in
+  --kill-after=1s)
+    exit 0
+    ;;
+  --kill-after=30s)
+    printf "%s %s|%s\\n" "$1" "$2" "$3 $4 $5" >>"$TMPDIR/timeout-seen"
+    shift 2
+    ;;
+  *)
+    printf "%s|%s\\n" "$1" "$2 $3 $4" >>"$TMPDIR/timeout-seen"
+    shift
+    ;;
+esac
 "$@"
 SH
 chmod +x "$TMPDIR/bin/timeout"
@@ -214,7 +225,7 @@ docker_e2e_build_or_reuse \\
   "$ROOT_DIR" \\
   functional
 
-test "$(grep -c '^3s|' "$TMPDIR/timeout-seen")" = "2"
+test "$(grep -c '^--kill-after=30s 3s|' "$TMPDIR/timeout-seen")" = "2"
 grep -q '^image inspect openclaw-reuse-image$' "$TMPDIR/docker-seen"
 grep -q '^pull openclaw-reuse-image$' "$TMPDIR/docker-seen"
 `;
@@ -382,8 +393,19 @@ export DOCKER_COMMAND_TIMEOUT=3s
 mkdir -p "$TMPDIR/bin"
 cat >"$TMPDIR/bin/timeout" <<'SH'
 #!/usr/bin/env bash
-printf "%s\\n" "$1" >"$TMPDIR/docker-timeout-seen"
-shift
+case "$1" in
+  --kill-after=1s)
+    exit 0
+    ;;
+  --kill-after=30s)
+    printf "%s %s\\n" "$1" "$2" >"$TMPDIR/docker-timeout-seen"
+    shift 2
+    ;;
+  *)
+    printf "%s\\n" "$1" >"$TMPDIR/docker-timeout-seen"
+    shift
+    ;;
+esac
 "$@"
 SH
 chmod +x "$TMPDIR/bin/timeout"
@@ -450,7 +472,7 @@ pack_dir="$(dirname "$package_tgz")"
 docker_e2e_package_mount_args "$package_tgz"
 DOCKER_STUB_STATUS=7 docker_e2e_run_with_harness image-name bash -lc true || run_status="$?"
 test "\${run_status:-0}" = "7"
-test "$(cat "$TMPDIR/docker-timeout-seen")" = "3s"
+test "$(cat "$TMPDIR/docker-timeout-seen")" = "--kill-after=30s 3s"
 test -f "$TMPDIR/package-mount-seen"
 test ! -e "$pack_dir"