diff --git a/tests/test_deployment_runtime_config.py b/tests/test_deployment_runtime_config.py
index 460947a4..2d10c822 100644
--- a/tests/test_deployment_runtime_config.py
+++ b/tests/test_deployment_runtime_config.py
@@ -46,4 +46,4 @@ def test_scan_terminal_backend_timeout_returns_before_next_proxy_abort():
     ).read_text(encoding="utf-8")
 
     assert 'POLYWEATHER_SCAN_TERMINAL_PROXY_TIMEOUT_MS || "28000"' in route_source
-    assert scan_terminal_config.SCAN_TERMINAL_BUILD_TIMEOUT_SEC <= 24
+    assert scan_terminal_config.SCAN_TERMINAL_BUILD_TIMEOUT_SEC <= 20
diff --git a/web/services/scan_terminal_config.py b/web/services/scan_terminal_config.py
index 7d35c02f..6576d628 100644
--- a/web/services/scan_terminal_config.py
+++ b/web/services/scan_terminal_config.py
@@ -33,7 +33,7 @@ SCAN_TERMINAL_BUILD_TIMEOUT_SEC = _env_int(
     "POLYWEATHER_SCAN_TERMINAL_BUILD_TIMEOUT_SEC",
     20,
     min_value=8,
-    max_value=24,
+    max_value=20,
 )
 SCAN_TERMINAL_MAX_WORKERS = _env_int(
     "POLYWEATHER_SCAN_TERMINAL_MAX_WORKERS",