diff --git a/python/packages/azurefunctions/agent_framework_azurefunctions/_orchestration.py b/python/packages/azurefunctions/agent_framework_azurefunctions/_orchestration.py
index da63db4016..724ba9903c 100644
--- a/python/packages/azurefunctions/agent_framework_azurefunctions/_orchestration.py
+++ b/python/packages/azurefunctions/agent_framework_azurefunctions/_orchestration.py
@@ -196,7 +196,7 @@ def run(  # type: ignore[override]
         messages: str | ChatMessage | Sequence[str | ChatMessage] | None = None,
         *,
         thread: AgentThread | None = None,
-        response_format: type[BaseModel] | None = None,
+        options: dict[str, Any] | None = None,
         **kwargs: Any,
     ) -> AgentTask:
         """Execute the agent with messages and return an AgentTask for orchestrations.
@@ -208,7 +208,7 @@ def run(  # type: ignore[override]
         Args:
             messages: The message(s) to send to the agent
             thread: Optional agent thread for conversation context
-            response_format: Optional Pydantic model for response parsing
+            options: Optional dict containing chat options like response_format, tools, etc.
             **kwargs: Additional arguments (enable_tool_calls)
 
         Returns:
@@ -219,13 +219,15 @@ def run(  # type: ignore[override]
             def my_orchestration(context):
                 agent = app.get_agent(context, "MyAgent")
                 thread = agent.get_new_thread()
-                response = yield agent.run("Hello", thread=thread)
+                response = yield agent.run("Hello", thread=thread, options={"response_format": MyModel})
                 # response is typed as AgentResponse
         """
         message_str = self._normalize_messages(messages)
 
-        # Extract optional parameters from kwargs
-        enable_tool_calls = kwargs.get("enable_tool_calls", True)
+        # Extract options from the options dict (aligned with ChatAgent pattern)
+        opts = options or {}
+        response_format: type[BaseModel] | None = opts.get("response_format")
+        enable_tool_calls = opts.get("enable_tool_calls", kwargs.get("enable_tool_calls", True))
 
         # Get the session ID for the entity
         if isinstance(thread, DurableAgentThread) and thread.session_id is not None:
diff --git a/python/packages/azurefunctions/tests/test_orchestration.py b/python/packages/azurefunctions/tests/test_orchestration.py
index e9d4ca1bd7..8a7473ee8b 100644
--- a/python/packages/azurefunctions/tests/test_orchestration.py
+++ b/python/packages/azurefunctions/tests/test_orchestration.py
@@ -364,7 +364,7 @@ class SampleSchema(BaseModel):
         # Create thread and call
         thread = agent.get_new_thread()
 
-        task = agent.run(messages="Test message", thread=thread, response_format=SampleSchema)
+        task = agent.run(messages="Test message", thread=thread, options={"response_format": SampleSchema})
 
         assert isinstance(task, AgentTask)
         assert task.children[0] == entity_task
diff --git a/python/packages/core/tests/azure/test_azure_chat_client.py b/python/packages/core/tests/azure/test_azure_chat_client.py
index fe8e066bf9..483b13f14f 100644
--- a/python/packages/core/tests/azure/test_azure_chat_client.py
+++ b/python/packages/core/tests/azure/test_azure_chat_client.py
@@ -657,7 +657,7 @@ async def test_azure_openai_chat_client_response_tools() -> None:
 
     assert response is not None
     assert isinstance(response, ChatResponse)
-    assert "scientists" in response.text
+    assert "Emily" in response.text or "David" in response.text
 
 
 @pytest.mark.flaky
@@ -692,7 +692,7 @@ async def test_azure_openai_chat_client_streaming() -> None:
             if isinstance(content, TextContent) and content.text:
                 full_message += content.text
 
-    assert "scientists" in full_message
+    assert "Emily" in full_message or "David" in full_message
 
 
 @pytest.mark.flaky
@@ -718,7 +718,7 @@ async def test_azure_openai_chat_client_streaming_tools() -> None:
             if isinstance(content, TextContent) and content.text:
                 full_message += content.text
 
-    assert "scientists" in full_message
+    assert "Emily" in full_message or "David" in full_message
 
 
 @pytest.mark.flaky