diff --git a/frontend/app/api/scan/terminal/route.ts b/frontend/app/api/scan/terminal/route.ts
index 86a5aa01..0d6b13d2 100644
--- a/frontend/app/api/scan/terminal/route.ts
+++ b/frontend/app/api/scan/terminal/route.ts
@@ -9,7 +9,7 @@ import {
 
 const API_BASE = process.env.POLYWEATHER_API_BASE_URL;
 const SCAN_TERMINAL_PROXY_TIMEOUT_MS = Number(
-  process.env.POLYWEATHER_SCAN_TERMINAL_PROXY_TIMEOUT_MS || "40000",
+  process.env.POLYWEATHER_SCAN_TERMINAL_PROXY_TIMEOUT_MS || "18000",
 );
 
 export const maxDuration = 45;
diff --git a/tests/test_deployment_runtime_config.py b/tests/test_deployment_runtime_config.py
index 483d186f..70b2482f 100644
--- a/tests/test_deployment_runtime_config.py
+++ b/tests/test_deployment_runtime_config.py
@@ -44,8 +44,12 @@ def test_scan_terminal_backend_timeout_returns_before_next_proxy_abort():
     route_source = (
         ROOT / "frontend" / "app" / "api" / "scan" / "terminal" / "route.ts"
     ).read_text(encoding="utf-8")
+    config_source = (
+        ROOT / "web" / "services" / "scan_terminal_config.py"
+    ).read_text(encoding="utf-8")
 
-    assert 'POLYWEATHER_SCAN_TERMINAL_PROXY_TIMEOUT_MS || "40000"' in route_source
+    assert 'POLYWEATHER_SCAN_TERMINAL_PROXY_TIMEOUT_MS || "18000"' in route_source
+    assert '"POLYWEATHER_SCAN_TERMINAL_BUILD_TIMEOUT_SEC",\n    10,' in config_source
     assert scan_terminal_config.SCAN_TERMINAL_BUILD_TIMEOUT_SEC <= 30
 
 
diff --git a/web/services/scan_terminal_config.py b/web/services/scan_terminal_config.py
index 2c625a9f..7dc0f46f 100644
--- a/web/services/scan_terminal_config.py
+++ b/web/services/scan_terminal_config.py
@@ -31,7 +31,7 @@ SCAN_TERMINAL_PAYLOAD_TTL_SEC = min(
 )
 SCAN_TERMINAL_BUILD_TIMEOUT_SEC = _env_int(
     "POLYWEATHER_SCAN_TERMINAL_BUILD_TIMEOUT_SEC",
-    30,
+    10,
     min_value=8,
     max_value=30,
 )