diff --git a/cli/planoai/config_generator.py b/cli/planoai/config_generator.py
index fcbae0e4..522968c9 100644
--- a/cli/planoai/config_generator.py
+++ b/cli/planoai/config_generator.py
@@ -466,15 +466,6 @@ def validate_and_render_schema():
         "upstream_tls_ca_path", "/etc/ssl/certs/ca-certificates.crt"
     )
 
-    upstream_timeout_ms = overrides.get("upstream_timeout_ms")
-    if upstream_timeout_ms is not None:
-        timeout_s = f"{int(upstream_timeout_ms) // 1000}s"
-        llm_gateway["timeout"] = timeout_s
-        prompt_gateway["timeout"] = timeout_s
-        for listener in listeners:
-            if listener.get("type") == "agent" and "timeout" not in listener:
-                listener["timeout"] = timeout_s
-
     data = {
         "prompt_gateway_listener": prompt_gateway,
         "llm_gateway_listener": llm_gateway,
diff --git a/config/plano_config_schema.yaml b/config/plano_config_schema.yaml
index 4fa4c133..b63cb824 100644
--- a/config/plano_config_schema.yaml
+++ b/config/plano_config_schema.yaml
@@ -265,10 +265,6 @@ properties:
         type: boolean
       use_agent_orchestrator:
         type: boolean
-      upstream_timeout_ms:
-        type: integer
-        minimum: 1000
-        description: "Timeout in milliseconds for outbound upstream calls from WASM filters (tool endpoints, function calling, default prompt targets). Default is 300000 (300s)."
       upstream_connect_timeout:
         type: string
         description: "Connect timeout for upstream provider clusters (e.g., '5s', '10s'). Default is '5s'."
diff --git a/crates/common/src/configuration.rs b/crates/common/src/configuration.rs
index 3afcecbf..f4e2b7b4 100644
--- a/crates/common/src/configuration.rs
+++ b/crates/common/src/configuration.rs
@@ -84,7 +84,6 @@ pub struct Overrides {
     pub prompt_target_intent_matching_threshold: Option<f64>,
     pub optimize_context_window: Option<bool>,
     pub use_agent_orchestrator: Option<bool>,
-    pub upstream_timeout_ms: Option<u64>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]