diff --git a/docs/config.html b/docs/config.html
index 8a513a3a..a5845178 100644
--- a/docs/config.html
+++ b/docs/config.html
@@ -334,6 +334,45 @@ <h2 id="authorizationconfiguration">AuthorizationConfiguration</h2>
         </tr>
       </tbody>
     </table>
+    <h2 id="azureentraidconfiguration">AzureEntraIdConfiguration</h2>
+    <p>Microsoft Entra ID authentication attributes for Azure.</p>
+    <table>
+      <colgroup>
+        <col style="width: 26%"/>
+        <col style="width: 23%"/>
+        <col style="width: 50%"/>
+      </colgroup>
+      <thead>
+        <tr class="header">
+          <th>Field</th>
+          <th>Type</th>
+          <th>Description</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr class="odd">
+          <td>tenant_id</td>
+          <td>string</td>
+          <td/>
+        </tr>
+        <tr class="even">
+          <td>client_id</td>
+          <td>string</td>
+          <td/>
+        </tr>
+        <tr class="odd">
+          <td>client_secret</td>
+          <td>string</td>
+          <td/>
+        </tr>
+        <tr class="even">
+          <td>scope</td>
+          <td>string</td>
+          <td>Azure Cognitive Services scope for token requests. Override only if
+using a different Azure service.</td>
+        </tr>
+      </tbody>
+    </table>
     <h2 id="byokrag">ByokRag</h2>
     <p>BYOK (Bring Your Own Knowledge) RAG configuration.</p>
     <table>
@@ -547,6 +586,11 @@ <h2 id="configuration">Configuration</h2>
           <td/>
           <td>Quota handlers configuration</td>
         </tr>
+        <tr class="odd">
+          <td>azure_entra_id</td>
+          <td/>
+          <td/>
+        </tr>
       </tbody>
     </table>
     <h2 id="conversationhistoryconfiguration">ConversationHistoryConfiguration</h2>
@@ -957,6 +1001,11 @@ <h2 id="modelcontextprotocolserver">ModelContextProtocolServer</h2>
       </li>
     </ul>
     <table>
+      <colgroup>
+        <col style="width: 26%"/>
+        <col style="width: 23%"/>
+        <col style="width: 50%"/>
+      </colgroup>
       <thead>
         <tr class="header">
           <th>Field</th>
@@ -980,6 +1029,23 @@ <h2 id="modelcontextprotocolserver">ModelContextProtocolServer</h2>
           <td>string</td>
           <td>URL of the MCP server</td>
         </tr>
+        <tr class="even">
+          <td>authorization_headers</td>
+          <td>object</td>
+          <td>Headers to send to the MCP server. The map contains the header name
+and the path to a file containing the header value (secret). There are 2
+special cases: 1. Usage of the kubernetes token in the header. To
+specify this use a string &#x2018;kubernetes&#x2019; instead of the file path. 2.
+Usage of the client provided token in the header. To specify this use a
+string &#x2018;client&#x2019; instead of the file path.</td>
+        </tr>
+        <tr class="odd">
+          <td>timeout</td>
+          <td>integer</td>
+          <td>Timeout in seconds for requests to the MCP server. If not specified,
+the default timeout from Llama Stack will be used. Note: This field is
+reserved for future use when Llama Stack adds timeout support.</td>
+        </tr>
       </tbody>
     </table>
     <h2 id="postgresqldatabaseconfiguration">PostgreSQLDatabaseConfiguration</h2>
diff --git a/docs/config.md b/docs/config.md
index 5b6dff7a..99df0eb4 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -91,6 +91,20 @@ Authorization configuration.
 | access_rules | array | Rules for role-based access control |
 
 
+## AzureEntraIdConfiguration
+
+
+Microsoft Entra ID authentication attributes for Azure.
+
+
+| Field | Type | Description |
+|-------|------|-------------|
+| tenant_id | string |  |
+| client_id | string |  |
+| client_secret | string |  |
+| scope | string | Azure Cognitive Services scope for token requests. Override only if using a different Azure service. |
+
+
 ## ByokRag
 
 
@@ -153,6 +167,7 @@ Global service configuration.
 | byok_rag | array | BYOK RAG configuration. This configuration can be used to reconfigure Llama Stack through its run.yaml configuration file |
 | a2a_state |  | Configuration for A2A protocol persistent state storage. |
 | quota_handlers |  | Quota handlers configuration |
+| azure_entra_id |  |  |
 
 
 ## ConversationHistoryConfiguration
@@ -353,6 +368,8 @@ Useful resources:
 | name | string | MCP server name that must be unique |
 | provider_id | string | MCP provider identification |
 | url | string | URL of the MCP server |
+| authorization_headers | object | Headers to send to the MCP server. The map contains the header name and the path to a file containing the header value (secret). There are 2 special cases: 1. Usage of the kubernetes token in the header. To specify this use a string 'kubernetes' instead of the file path. 2. Usage of the client provided token in the header. To specify this use a string 'client' instead of the file path. |
+| timeout | integer | Timeout in seconds for requests to the MCP server. If not specified, the default timeout from Llama Stack will be used. Note: This field is reserved for future use when Llama Stack adds timeout support. |
 
 
 ## PostgreSQLDatabaseConfiguration