diff --git a/src/api/Elastic.Documentation.Api.Infrastructure/Adapters/AskAi/LlmGatewayAskAiGateway.cs b/src/api/Elastic.Documentation.Api.Infrastructure/Adapters/AskAi/LlmGatewayAskAiGateway.cs
index 153cf79d6..58194dc80 100644
--- a/src/api/Elastic.Documentation.Api.Infrastructure/Adapters/AskAi/LlmGatewayAskAiGateway.cs
+++ b/src/api/Elastic.Documentation.Api.Infrastructure/Adapters/AskAi/LlmGatewayAskAiGateway.cs
@@ -56,6 +56,7 @@ public async Task<AskAiGatewayResponse> AskAi(AskAiRequest askAiRequest, Cancel
 }
 
 public record LlmGatewayRequest(
+	AgentOptions AgentOptions,
 	UserContext UserContext,
 	PlatformContext PlatformContext,
 	ChatInput[] Input,
@@ -64,11 +65,11 @@ string ThreadId
 {
 	public static LlmGatewayRequest CreateFromRequest(AskAiRequest request, Guid conversationId) =>
 		new(
+			AgentOptions: new AgentOptions(FirstGenerationTimeout: 60000),
 			UserContext: new UserContext("elastic-docs-v3@invalid"),
 			PlatformContext: new PlatformContext("docs_site", "docs_assistant", []),
 			Input:
 			[
-				// new ChatInput("user", AskAiRequest.SystemPrompt),
 				new ChatInput("user", request.Message)
 			],
 			ThreadId: conversationId.ToString()
@@ -77,6 +78,8 @@ public static LlmGatewayRequest CreateFromRequest(AskAiRequest request, Guid con
 
 public record UserContext(string UserEmail);
 
+public record AgentOptions(int FirstGenerationTimeout);
+
 public record PlatformContext(
 	string Origin,
 	string UseCase,