diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py
index cf29cc5..18c9d56 100644
--- a/nanobot/cli/commands.py
+++ b/nanobot/cli/commands.py
@@ -328,7 +328,7 @@ def gateway(
         workspace=config.workspace_path,
         model=config.agents.defaults.model,
         temperature=config.agents.defaults.temperature,
-        max_tokens=config.agents.defaults.max_tokens,
+        max_tokens=config.agents.defaults.max_tokens_output,
         max_iterations=config.agents.defaults.max_tool_iterations,
         reasoning_effort=config.agents.defaults.reasoning_effort,
         max_tokens_input=config.agents.defaults.max_tokens_input,
@@ -515,7 +515,7 @@ def agent(
         workspace=config.workspace_path,
         model=config.agents.defaults.model,
         temperature=config.agents.defaults.temperature,
-        max_tokens=config.agents.defaults.max_tokens,
+        max_tokens=config.agents.defaults.max_tokens_output,
         max_iterations=config.agents.defaults.max_tool_iterations,
         reasoning_effort=config.agents.defaults.reasoning_effort,
         max_tokens_input=config.agents.defaults.max_tokens_input,