diff --git a/.gitignore b/.gitignore
index 7193dd15..58e305d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,7 +107,10 @@ coverage/
 a365.config.json
 a365.generated.config.json
 app.zip
+app_logs.zip
+app_logs/
 publish/
+manifest/
 
 # OS-specific files
 .DS_Store
diff --git a/nodejs/claude/sample-agent/.env.template b/nodejs/claude/sample-agent/.env.template
index 79f14963..674d99e2 100644
--- a/nodejs/claude/sample-agent/.env.template
+++ b/nodejs/claude/sample-agent/.env.template
@@ -3,6 +3,9 @@ ANTHROPIC_API_KEY=
 
 # MCP Tooling Configuration
 BEARER_TOKEN=
+# V2 per-server bearer tokens (dev mode — SDK reads BEARER_TOKEN_<SERVER_NAME_UPPER>)
+BEARER_TOKEN_MCP_MAILTOOLS=
+BEARER_TOKEN_MCP_CALENDARTOOLS=
 
 # Enable to use observability exporter, default is false which means using console exporter
 ENABLE_A365_OBSERVABILITY_EXPORTER=false
diff --git a/nodejs/claude/sample-agent/ToolingManifest.json b/nodejs/claude/sample-agent/ToolingManifest.json
index eba08717..e103e7a3 100644
--- a/nodejs/claude/sample-agent/ToolingManifest.json
+++ b/nodejs/claude/sample-agent/ToolingManifest.json
@@ -1,18 +1,12 @@
 {
   "mcpServers": [
     {
-      "mcpServerName": "mcp_MailTools",
-      "mcpServerUniqueName": "mcp_MailTools",
-      "url": "https://agent365.svc.cloud.microsoft/agents/servers/mcp_MailTools",
-      "scope": "McpServers.Mail.All",
-      "audience": "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1"
-    },
-    {
-      "mcpServerName": "mcp_WordServer",
-      "mcpServerUniqueName": "mcp_WordServer",
-      "url": "https://agent365.svc.cloud.microsoft/agents/servers/mcp_WordServer",
-      "scope": "McpServers.Word.All",
-      "audience": "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1"
+      "mcpServerName": "mcp_CalendarTools",
+      "mcpServerUniqueName": "mcp_CalendarTools",
+      "url": "https://agent365.svc.cloud.microsoft/agents/servers/mcp_CalendarTools",
+      "scope": "Tools.ListInvoke.All",
+      "audience": "910333d2-47e9-43ca-981f-6df2f4531ef4",
+      "publisher": "Microsoft"
     }
   ]
 }
\ No newline at end of file
diff --git a/nodejs/langchain/sample-agent/.env.example b/nodejs/langchain/sample-agent/.env.example
index 4345c0f2..b3e87e9c 100644
--- a/nodejs/langchain/sample-agent/.env.example
+++ b/nodejs/langchain/sample-agent/.env.example
@@ -12,6 +12,9 @@ OPENAI_MODEL=gpt-4o
 
 # MCP Tooling Configuration
 BEARER_TOKEN=
+# V2 per-server bearer tokens (dev mode — SDK reads BEARER_TOKEN_<SERVER_NAME_UPPER>)
+BEARER_TOKEN_MCP_MAILTOOLS=
+BEARER_TOKEN_MCP_CALENDARTOOLS=
 
 # MCPPlatform Configuration. Default to production values.
 MCP_PLATFORM_ENDPOINT=
diff --git a/nodejs/langchain/sample-agent/ToolingManifest.json b/nodejs/langchain/sample-agent/ToolingManifest.json
index e842561c..e103e7a3 100644
--- a/nodejs/langchain/sample-agent/ToolingManifest.json
+++ b/nodejs/langchain/sample-agent/ToolingManifest.json
@@ -1,11 +1,12 @@
 {
   "mcpServers": [
     {
-      "mcpServerName": "mcp_MailTools",
-      "mcpServerUniqueName": "mcp_MailTools",
-      "url": "https://agent365.svc.cloud.microsoft/agents/servers/mcp_MailTools",
-      "scope": "McpServers.Mail.All",
-      "audience": "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1"
+      "mcpServerName": "mcp_CalendarTools",
+      "mcpServerUniqueName": "mcp_CalendarTools",
+      "url": "https://agent365.svc.cloud.microsoft/agents/servers/mcp_CalendarTools",
+      "scope": "Tools.ListInvoke.All",
+      "audience": "910333d2-47e9-43ca-981f-6df2f4531ef4",
+      "publisher": "Microsoft"
     }
   ]
 }
\ No newline at end of file
diff --git a/nodejs/openai/sample-agent/.env.template b/nodejs/openai/sample-agent/.env.template
index f8c30d50..bd112b45 100644
--- a/nodejs/openai/sample-agent/.env.template
+++ b/nodejs/openai/sample-agent/.env.template
@@ -13,6 +13,9 @@ AZURE_OPENAI_API_VERSION=2024-10-21
 
 # MCP Tooling Configuration
 BEARER_TOKEN=
+# V2 per-server bearer tokens (dev mode — SDK reads BEARER_TOKEN_<SERVER_NAME_UPPER>)
+BEARER_TOKEN_MCP_MAILTOOLS=
+BEARER_TOKEN_MCP_CALENDARTOOLS=
 
 # Enable to use observability exporter, default is false which means using console exporter
 ENABLE_A365_OBSERVABILITY_EXPORTER=false
diff --git a/nodejs/openai/sample-agent/ToolingManifest.json b/nodejs/openai/sample-agent/ToolingManifest.json
index 9de6530d..e103e7a3 100644
--- a/nodejs/openai/sample-agent/ToolingManifest.json
+++ b/nodejs/openai/sample-agent/ToolingManifest.json
@@ -1,18 +1,12 @@
 {
   "mcpServers": [
-    {
-      "mcpServerName": "mcp_MailTools",
-      "mcpServerUniqueName": "mcp_MailTools",
-      "url": "https://agent365.svc.cloud.microsoft/agents/servers/mcp_MailTools",
-      "scope": "McpServers.Mail.All",
-      "audience": "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1"
-    },
     {
       "mcpServerName": "mcp_CalendarTools",
       "mcpServerUniqueName": "mcp_CalendarTools",
       "url": "https://agent365.svc.cloud.microsoft/agents/servers/mcp_CalendarTools",
-      "scope": "McpServers.Calendar.All",
-      "audience": "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1"
+      "scope": "Tools.ListInvoke.All",
+      "audience": "910333d2-47e9-43ca-981f-6df2f4531ef4",
+      "publisher": "Microsoft"
     }
   ]
 }
\ No newline at end of file