diff --git a/partners/server-schema.json b/partners/server-schema.json
index 7ffbc1b..5faded3 100644
--- a/partners/server-schema.json
+++ b/partners/server-schema.json
@@ -370,6 +370,8 @@
         "description": "Authentication schemas. Turned into x-ms-auth-schemas.",
         "enum": [
           "OAuth2",
+          "UserEntraToken",
+          "AgentOnBehalfOfUser",
           "ManagedIdentity",
           "AgentIdentity"
         ]
diff --git a/partners/servers/a365-calender-mcp-server.json b/partners/servers/a365-calender-mcp-server.json
index 8b12f66..e3d0d4e 100644
--- a/partners/servers/a365-calender-mcp-server.json
+++ b/partners/servers/a365-calender-mcp-server.json
@@ -62,7 +62,7 @@
       "scopes": ["ea9ffc3e-8a23-4a7d-836d-234d7c7565c1/McpServers.Calendar.All"]
     }
   },
-  "authSchemas":["OAuth2"],
+  "authSchemas":["OAuth2", "UserEntraToken", "AgentOnBehalfOfUser"],
   "audience": "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1",
   "versionName": "original",
   "customProperties": { "x-ms-preview": true },
diff --git a/partners/servers/a365-copilot-search-mcp-server.json b/partners/servers/a365-copilot-search-mcp-server.json
index 5531810..2fd3de9 100644
--- a/partners/servers/a365-copilot-search-mcp-server.json
+++ b/partners/servers/a365-copilot-search-mcp-server.json
@@ -58,7 +58,7 @@
       "scopes": ["ea9ffc3e-8a23-4a7d-836d-234d7c7565c1/McpServers.CopilotMCP.All"]
     }
   },
-  "authSchemas":["OAuth2"],
+  "authSchemas":["OAuth2", "UserEntraToken", "AgentOnBehalfOfUser"],
   "audience": "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1",
   "versionName": "original",
   "customProperties": { "x-ms-preview": true },
diff --git a/partners/servers/a365-dataverse-mcp-server.json b/partners/servers/a365-dataverse-mcp-server.json
index 8a5bd19..12be3b7 100644
--- a/partners/servers/a365-dataverse-mcp-server.json
+++ b/partners/servers/a365-dataverse-mcp-server.json
@@ -54,11 +54,10 @@
       "scopes": ["ea9ffc3e-8a23-4a7d-836d-234d7c7565c1/McpServers.Dataverse.All"]
     }
   },
-  "authSchemas":["OAuth2"],
+  "authSchemas":["OAuth2", "UserEntraToken", "AgentOnBehalfOfUser"],
   "audience": "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1",
   "versionName": "original",
   "customProperties": { "x-ms-preview": true }
 
 }
 
-
diff --git a/partners/servers/a365-mail-mcp-server.json b/partners/servers/a365-mail-mcp-server.json
index 1d8d384..47759e3 100644
--- a/partners/servers/a365-mail-mcp-server.json
+++ b/partners/servers/a365-mail-mcp-server.json
@@ -54,11 +54,10 @@
       "scopes": ["ea9ffc3e-8a23-4a7d-836d-234d7c7565c1/McpServers.Mail.All"]
     }
   },
-  "authSchemas":["OAuth2"],
+  "authSchemas":["OAuth2", "UserEntraToken", "AgentOnBehalfOfUser"],
   "audience": "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1",
   "versionName": "original",
   "customProperties": { "x-ms-preview": true },
   "tags": ["a365"]
 }
 
-
diff --git a/partners/servers/a365-onedrive-mcp-server.json b/partners/servers/a365-onedrive-mcp-server.json
index 44cc1f5..e1c0720 100644
--- a/partners/servers/a365-onedrive-mcp-server.json
+++ b/partners/servers/a365-onedrive-mcp-server.json
@@ -86,7 +86,7 @@
       "scopes": ["ea9ffc3e-8a23-4a7d-836d-234d7c7565c1/McpServers.OneDrive.All"]
     }
   },
-  "authSchemas":["OAuth2"],
+  "authSchemas":["OAuth2", "UserEntraToken", "AgentOnBehalfOfUser"],
   "audience": "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1",
   "versionName": "original",
   "customProperties": { "x-ms-preview": true },
diff --git a/partners/servers/a365-sharepoint-mcp-server.json b/partners/servers/a365-sharepoint-mcp-server.json
index be424e7..4413bc0 100644
--- a/partners/servers/a365-sharepoint-mcp-server.json
+++ b/partners/servers/a365-sharepoint-mcp-server.json
@@ -154,7 +154,7 @@
       "scopes": ["ea9ffc3e-8a23-4a7d-836d-234d7c7565c1/McpServers.SharePoint.All"]
     }
   },
-  "authSchemas":["OAuth2"],
+  "authSchemas":["OAuth2", "UserEntraToken", "AgentOnBehalfOfUser"],
   "audience": "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1",
   "versionName": "original",
   "customProperties": { "x-ms-preview": true },
@@ -162,4 +162,3 @@
 }
 
 
-
diff --git a/partners/servers/a365-teams-mcp-server.json b/partners/servers/a365-teams-mcp-server.json
index 219ad1e..2c5ccd9 100644
--- a/partners/servers/a365-teams-mcp-server.json
+++ b/partners/servers/a365-teams-mcp-server.json
@@ -54,11 +54,10 @@
       "scopes": ["ea9ffc3e-8a23-4a7d-836d-234d7c7565c1/McpServers.Teams.All"]
     }
   },
-  "authSchemas":["OAuth2"],
+  "authSchemas":["OAuth2", "UserEntraToken", "AgentOnBehalfOfUser"],
   "audience": "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1",
   "versionName": "original",
   "customProperties": { "x-ms-preview": true },
   "tags": ["a365"]
 }
 
-
diff --git a/partners/servers/a365-user-mcp-server.json b/partners/servers/a365-user-mcp-server.json
index 1658975..6fd4170 100644
--- a/partners/servers/a365-user-mcp-server.json
+++ b/partners/servers/a365-user-mcp-server.json
@@ -54,11 +54,10 @@
       "scopes": ["ea9ffc3e-8a23-4a7d-836d-234d7c7565c1/McpServers.Me.All"]
     }
   },
-  "authSchemas":["OAuth2"],
+  "authSchemas":["OAuth2", "UserEntraToken", "AgentOnBehalfOfUser"],
   "audience": "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1",
   "versionName": "original",
   "customProperties": { "x-ms-preview": true },
   "tags": ["a365"]
 }
 
-
diff --git a/partners/servers/a365-word-mcp-server.json b/partners/servers/a365-word-mcp-server.json
index a4e073f..3836431 100644
--- a/partners/servers/a365-word-mcp-server.json
+++ b/partners/servers/a365-word-mcp-server.json
@@ -50,7 +50,7 @@
       "scopes": ["ea9ffc3e-8a23-4a7d-836d-234d7c7565c1/McpServers.Word.All"]
     }
   },
-  "authSchemas":["OAuth2"],
+  "authSchemas":["OAuth2", "UserEntraToken", "AgentOnBehalfOfUser"],
   "audience": "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1",
   "versionName": "original",
   "customProperties": { "x-ms-preview": true },
@@ -58,4 +58,3 @@
 }
 
 
-
diff --git a/partners/servers/algolia-mcp-server.json b/partners/servers/algolia-mcp-server.json
index eb0b420..54e9453 100644
--- a/partners/servers/algolia-mcp-server.json
+++ b/partners/servers/algolia-mcp-server.json
@@ -54,9 +54,6 @@
       ]
     }
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "versionName": "original",
   "supportContactInfo": {
     "name": "Algolia Support",
diff --git a/partners/servers/amperity-mcp-server.json b/partners/servers/amperity-mcp-server.json
index 6ceb788..f0d59a9 100644
--- a/partners/servers/amperity-mcp-server.json
+++ b/partners/servers/amperity-mcp-server.json
@@ -64,9 +64,6 @@
       ]
     }
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "license": {
     "name": "Amperity Online Terms and Conditions",
     "url": "https://images.ctfassets.net/5vqt5w81x2im/2xZdr5ADwi3el1WkOCBWTN/be67669fea1dc163b3803fa2d8bbd006/Amperity_Online_Terms_and_Conditions__2025-12-10_.pdf"
diff --git a/partners/servers/avalara-avatax-mcp-server.json b/partners/servers/avalara-avatax-mcp-server.json
index 5df4e93..72a5516 100644
--- a/partners/servers/avalara-avatax-mcp-server.json
+++ b/partners/servers/avalara-avatax-mcp-server.json
@@ -71,9 +71,6 @@
     "name": "Avalara Developer Support",
     "url": "https://developer.avalara.com"
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "securitySchemes": {
     "avalaraAvataxOauth": {
       "type": "oauth2",
diff --git a/partners/servers/avalara-business-licensing.json b/partners/servers/avalara-business-licensing.json
index 38f80ea..347488d 100644
--- a/partners/servers/avalara-business-licensing.json
+++ b/partners/servers/avalara-business-licensing.json
@@ -64,9 +64,6 @@
     "name": "Avalara Developer Support",
     "url": "https://developer.avalara.com"
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "securitySchemes": {
     "avalaraBusinessLicensingOauth": {
       "type": "oauth2",
diff --git a/partners/servers/avalara-classification.json b/partners/servers/avalara-classification.json
index ebb9fea..0217089 100644
--- a/partners/servers/avalara-classification.json
+++ b/partners/servers/avalara-classification.json
@@ -64,9 +64,6 @@
     "name": "Avalara Developer Support",
     "url": "https://developer.avalara.com"
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "securitySchemes": {
     "avalaraClassificationOauth": {
       "type": "oauth2",
diff --git a/partners/servers/avalara-cross-border.json b/partners/servers/avalara-cross-border.json
index 3e8add6..10ddd8c 100644
--- a/partners/servers/avalara-cross-border.json
+++ b/partners/servers/avalara-cross-border.json
@@ -63,9 +63,6 @@
     "name": "Avalara Developer Support",
     "url": "https://developer.avalara.com"
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "securitySchemes": {
     "avalaraCrossBorderOauth": {
       "type": "oauth2",
diff --git a/partners/servers/avalara-dev-docs.json b/partners/servers/avalara-dev-docs.json
index c2edccd..3f9d62f 100644
--- a/partners/servers/avalara-dev-docs.json
+++ b/partners/servers/avalara-dev-docs.json
@@ -64,9 +64,6 @@
     "name": "Avalara Developer Support",
     "url": "https://developer.avalara.com"
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "securitySchemes": {
     "avalaraDevDocsOauth": {
       "type": "oauth2",
diff --git a/partners/servers/avalara-e-invoicing.json b/partners/servers/avalara-e-invoicing.json
index 7e9033c..ba9f6f0 100644
--- a/partners/servers/avalara-e-invoicing.json
+++ b/partners/servers/avalara-e-invoicing.json
@@ -64,9 +64,6 @@
     "name": "Avalara Developer Support",
     "url": "https://developer.avalara.com"
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "securitySchemes": {
     "avalaraEInvoicingOauth": {
       "type": "oauth2",
diff --git a/partners/servers/avalara-exemption-certificates.json b/partners/servers/avalara-exemption-certificates.json
index 905ebe0..9653cc6 100644
--- a/partners/servers/avalara-exemption-certificates.json
+++ b/partners/servers/avalara-exemption-certificates.json
@@ -64,9 +64,6 @@
     "name": "Avalara Developer Support",
     "url": "https://developer.avalara.com"
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "securitySchemes": {
     "avalaraExemptionCertificatesOauth": {
       "type": "oauth2",
diff --git a/partners/servers/avalara-returns.json b/partners/servers/avalara-returns.json
index 0f9a52a..a46ac3f 100644
--- a/partners/servers/avalara-returns.json
+++ b/partners/servers/avalara-returns.json
@@ -64,9 +64,6 @@
     "name": "Avalara Developer Support",
     "url": "https://developer.avalara.com"
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "securitySchemes": {
     "avalaraReturnsOauth": {
       "type": "oauth2",
diff --git a/partners/servers/avalara-tax-content.json b/partners/servers/avalara-tax-content.json
index 77e3dc3..84df512 100644
--- a/partners/servers/avalara-tax-content.json
+++ b/partners/servers/avalara-tax-content.json
@@ -64,9 +64,6 @@
     "name": "Avalara Developer Support",
     "url": "https://developer.avalara.com"
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "securitySchemes": {
     "avalaraTaxContentOauth": {
       "type": "oauth2",
diff --git a/partners/servers/azure-devops-mcp-server.json b/partners/servers/azure-devops-mcp-server.json
index fc41361..3317c2a 100644
--- a/partners/servers/azure-devops-mcp-server.json
+++ b/partners/servers/azure-devops-mcp-server.json
@@ -58,7 +58,7 @@
       "scopes": ["2a72489c-aab2-4b65-b93a-a91edccf33b8/Ado.Mcp.Tools"]
     }
   },
-  "authSchemas":["OAuth2", "ManagedIdentity"],
+  "authSchemas":["OAuth2", "UserEntraToken", "AgentOnBehalfOfUser", "ManagedIdentity"],
   "audience": "api://2a72489c-aab2-4b65-b93a-a91edccf33b8",
   "versionName": "original",
   "customProperties": { "x-ms-preview": false }
diff --git a/partners/servers/azure-foundry-mcp-server.json b/partners/servers/azure-foundry-mcp-server.json
index 9ad4c38..65d2b5e 100644
--- a/partners/servers/azure-foundry-mcp-server.json
+++ b/partners/servers/azure-foundry-mcp-server.json
@@ -43,7 +43,9 @@
         "url": "https://azure.microsoft.com/en-us/support/"
     },
     "authSchemas": [
-        "OAuth2"
+        "OAuth2",
+        "UserEntraToken",
+        "AgentOnBehalfOfUser"
     ],
     "audience": "https://mcp.ai.azure.com",
     "customProperties": { "x-ms-preview": true }
diff --git a/partners/servers/druva-mcp-server.json b/partners/servers/druva-mcp-server.json
index 9bc5784..e2c5a54 100644
--- a/partners/servers/druva-mcp-server.json
+++ b/partners/servers/druva-mcp-server.json
@@ -63,9 +63,6 @@
       ]
     }
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "versionName": "original",
   "supportContactInfo": {
     "name": "Druva Support",
diff --git a/partners/servers/enterprise-mcp-server.json b/partners/servers/enterprise-mcp-server.json
index a7db6a7..6e18241 100644
--- a/partners/servers/enterprise-mcp-server.json
+++ b/partners/servers/enterprise-mcp-server.json
@@ -59,7 +59,7 @@
             "flows": ["authorizationCode"]                
         }
     },
-    "authSchemas": ["OAuth2", "AgentIdentity"],
+    "authSchemas": ["OAuth2", "AgentOnBehalfOfUser", "AgentIdentity"],
     "audience": "api://e8c77dc2-69b3-43f4-bc51-3213c9d915b4",
     "supportContactInfo": {
         "name": "Luca Spolidoro",
diff --git a/partners/servers/idealift-mcp-server.json b/partners/servers/idealift-mcp-server.json
index a2c5f61..41cfc06 100644
--- a/partners/servers/idealift-mcp-server.json
+++ b/partners/servers/idealift-mcp-server.json
@@ -67,9 +67,6 @@
       "bearerFormat": "il_live_..."
     }
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "audience": "api://7734d6d3-8257-4a2b-a35e-1702ddbeeb6f",
   "versionName": "v1",
   "versionTitle": "IdeaLift MCP v1 (Foundry OBO GA)",
diff --git a/partners/servers/lovable-mcp-server.json b/partners/servers/lovable-mcp-server.json
index 302bc72..653fc7c 100644
--- a/partners/servers/lovable-mcp-server.json
+++ b/partners/servers/lovable-mcp-server.json
@@ -41,9 +41,6 @@
     "remote": "https://mcp.lovable.dev",
     "remoteType": "streamable-http",
     "versionName": "Original",
-    "authSchemas": [
-        "OAuth2"
-    ],
     "securitySchemes": {
         "lovableOauth": {
             "type": "oauth2",
diff --git a/partners/servers/microsoft-sentinel-data-exploration-mcp-server.json b/partners/servers/microsoft-sentinel-data-exploration-mcp-server.json
index e02babe..1e4f4a6 100644
--- a/partners/servers/microsoft-sentinel-data-exploration-mcp-server.json
+++ b/partners/servers/microsoft-sentinel-data-exploration-mcp-server.json
@@ -70,7 +70,7 @@
     }
   },
   "visibility": "true",
-  "authSchemas":["OAuth2","AgentIdentity"],
+  "authSchemas":["OAuth2", "UserEntraToken", "AgentOnBehalfOfUser", "AgentIdentity"],
   "audience": "4500ebfb-89b6-4b14-a480-7f749797bfcd",
   "customProperties": { "x-ms-preview": true }
 }
diff --git a/partners/servers/microsoft-sentinel-graph-mcp-server.json b/partners/servers/microsoft-sentinel-graph-mcp-server.json
index 72d4f19..1c097f2 100644
--- a/partners/servers/microsoft-sentinel-graph-mcp-server.json
+++ b/partners/servers/microsoft-sentinel-graph-mcp-server.json
@@ -54,7 +54,7 @@
     }
   },
   "visibility": "true",
-  "authSchemas":["OAuth2","AgentIdentity"],
+  "authSchemas":["OAuth2", "UserEntraToken", "AgentOnBehalfOfUser", "AgentIdentity"],
   "audience": "4500ebfb-89b6-4b14-a480-7f749797bfcd",
   "customProperties": { "x-ms-preview": true }
 }
diff --git a/partners/servers/microsoft-sentinel-knowledge-objects-mcp-server.json b/partners/servers/microsoft-sentinel-knowledge-objects-mcp-server.json
index 917920c..bf0da56 100644
--- a/partners/servers/microsoft-sentinel-knowledge-objects-mcp-server.json
+++ b/partners/servers/microsoft-sentinel-knowledge-objects-mcp-server.json
@@ -39,7 +39,7 @@
     }
   },
   "visibility": "true",
-  "authSchemas":["OAuth2","AgentIdentity"],
+  "authSchemas":["OAuth2", "UserEntraToken", "AgentOnBehalfOfUser", "AgentIdentity"],
   "audience": "4500ebfb-89b6-4b14-a480-7f749797bfcd",
   "customProperties": { "x-ms-preview": true }
 }
diff --git a/partners/servers/microsoft-sentinel-memory-mcp-server.json b/partners/servers/microsoft-sentinel-memory-mcp-server.json
index 9e59866..8275cd5 100644
--- a/partners/servers/microsoft-sentinel-memory-mcp-server.json
+++ b/partners/servers/microsoft-sentinel-memory-mcp-server.json
@@ -54,7 +54,7 @@
     }
   },
   "visibility": "true",
-  "authSchemas":["OAuth2","AgentIdentity"],
+  "authSchemas":["OAuth2", "UserEntraToken", "AgentOnBehalfOfUser", "AgentIdentity"],
   "audience": "4500ebfb-89b6-4b14-a480-7f749797bfcd",
   "customProperties": { "x-ms-preview": true }
 }
diff --git a/partners/servers/mongodb-remote-mcp-server.json b/partners/servers/mongodb-remote-mcp-server.json
index e970c5c..2c0abfa 100644
--- a/partners/servers/mongodb-remote-mcp-server.json
+++ b/partners/servers/mongodb-remote-mcp-server.json
@@ -29,7 +29,6 @@
         "scopes": []
       }
     },
-    "authSchemas": ["OAuth2"],
     "icon": "https://cdn.jsdelivr.net/gh/Azure/MCP/community/registry/icons/mongodb.svg",
     "useCases": [
       {
diff --git a/partners/servers/neo4j-mcp-server.json b/partners/servers/neo4j-mcp-server.json
index 0e15786..f19550e 100644
--- a/partners/servers/neo4j-mcp-server.json
+++ b/partners/servers/neo4j-mcp-server.json
@@ -79,7 +79,6 @@
       "email": "support@neo4j.com",
       "url": "https://support.neo4j.com/"
     },
-    "authSchemas": ["OAuth2"],
     "customProperties": {
       "x-ms-preview": false
     }
diff --git a/partners/servers/snowflake-mcp-server.json b/partners/servers/snowflake-mcp-server.json
index 764157d..546d3d6 100644
--- a/partners/servers/snowflake-mcp-server.json
+++ b/partners/servers/snowflake-mcp-server.json
@@ -52,9 +52,6 @@
       "scopes": []
     }
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "versionName": "original",
   "supportContactInfo": {
     "name": "Snowflake Support",
diff --git a/partners/servers/stilingue-by-blip-mcp-server.json b/partners/servers/stilingue-by-blip-mcp-server.json
index 13a1ec8..0d0f461 100644
--- a/partners/servers/stilingue-by-blip-mcp-server.json
+++ b/partners/servers/stilingue-by-blip-mcp-server.json
@@ -70,9 +70,6 @@
       "scopes": []
     }
   },
-  "authSchemas": [
-    "OAuth2"
-  ],
   "versionName": "original",
   "versionTitle": "Initial release",
   "customProperties": {