diff --git a/cli/planoai/utils.py b/cli/planoai/utils.py
index 50e5b2b7..171006f1 100644
--- a/cli/planoai/utils.py
+++ b/cli/planoai/utils.py
@@ -147,10 +147,6 @@ def convert_legacy_listeners(
 
     model_provider_set = False
     for listener in listeners:
-        # Ensure address and timeout defaults for all listeners
-        listener.setdefault("address", "0.0.0.0")
-        listener.setdefault("timeout", "30s")
-
         if listener.get("type") == "model":
             if model_provider_set:
                 raise ValueError(
@@ -158,9 +154,10 @@ def convert_legacy_listeners(
                 )
             listener["model_providers"] = model_providers or []
             model_provider_set = True
-            llm_gateway_listener = listener
+            # Merge user listener values into defaults for the Envoy template
+            llm_gateway_listener = {**llm_gateway_listener, **listener}
         elif listener.get("type") == "prompt":
-            prompt_gateway_listener = listener
+            prompt_gateway_listener = {**prompt_gateway_listener, **listener}
     if not model_provider_set:
         listeners.append(llm_gateway_listener)