diff --git a/agent-platforms/salesforce/apex-observability/README.md b/agent-platforms/salesforce/apex-observability/README.md
index 5820d860..039c7028 100644
--- a/agent-platforms/salesforce/apex-observability/README.md
+++ b/agent-platforms/salesforce/apex-observability/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Salesforce Apex — Native Agent 365 Observability"
+page_type: sample
+languages:
+- apex
+products:
+- agent-365
+description: "Emit native Agent 365 telemetry from Salesforce Apex with correlated OTLP spans and agent-bound authentication."
+---
+-->
+
 # Salesforce Apex — Native Agent 365 Observability
 
 This sample shows how **Salesforce Apex** can participate in [Microsoft Agent 365](https://learn.microsoft.com/en-us/microsoft-agent-365/developer/)
diff --git a/dotnet/agent-framework/sample-agent/README.md b/dotnet/agent-framework/sample-agent/README.md
index 2ee5cedc..7c519f8e 100644
--- a/dotnet/agent-framework/sample-agent/README.md
+++ b/dotnet/agent-framework/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Agent Framework (Simple) Sample"
+page_type: sample
+languages:
+- csharp
+products:
+- agent-365
+description: "Build a .NET agent with Agent Framework and Agent 365 observability, notifications, and MCP tools."
+---
+-->
+
 # Agent Framework (Simple) Sample
 
 ## Overview
diff --git a/dotnet/autonomous/github-trending/sample-agent/README.md b/dotnet/autonomous/github-trending/sample-agent/README.md
index c9c56f28..a47c9d3b 100644
--- a/dotnet/autonomous/github-trending/sample-agent/README.md
+++ b/dotnet/autonomous/github-trending/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Autonomous Agent — .NET Sample"
+page_type: sample
+languages:
+- csharp
+products:
+- agent-365
+description: "Run an autonomous .NET agent that summarizes trending GitHub repositories with Azure OpenAI and Agent 365 tracing."
+---
+-->
+
 # Autonomous Agent — .NET Sample
 
 This sample demonstrates a **purely autonomous agent** built with the Microsoft Agent 365 SDK for .NET. Unlike the interactive agent samples, this agent has **no chat functionality** — it runs entirely as a background service using the `BackgroundService` pattern.
diff --git a/dotnet/semantic-kernel/sample-agent/README.md b/dotnet/semantic-kernel/sample-agent/README.md
index 220f4c17..bebeaac8 100644
--- a/dotnet/semantic-kernel/sample-agent/README.md
+++ b/dotnet/semantic-kernel/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Semantic Kernel Sample Agent - C#/.NET"
+page_type: sample
+languages:
+- csharp
+products:
+- agent-365
+description: "Build a Semantic Kernel agent in .NET with Agent 365 observability, notifications, and MCP tools."
+---
+-->
+
 # Semantic Kernel Sample Agent - C#/.NET
 
 This sample demonstrates how to build an agent using Semantic Kernel in C#/.NET with the Microsoft Agent 365 SDK. It covers:
diff --git a/dotnet/w365-computer-use/sample-agent/README.md b/dotnet/w365-computer-use/sample-agent/README.md
index 71f8b38f..d29d988e 100644
--- a/dotnet/w365-computer-use/sample-agent/README.md
+++ b/dotnet/w365-computer-use/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "W365 Computer Use Sample"
+page_type: sample
+languages:
+- csharp
+products:
+- agent-365
+description: "Control a Windows 365 Cloud PC from a .NET agent using the OpenAI Responses API and W365 Computer Use MCP tools."
+---
+-->
+
 # W365 Computer Use Sample
 
 ## Overview
diff --git a/nodejs/autonomous/github-trending/README.md b/nodejs/autonomous/github-trending/README.md
index fe255977..5842d82e 100644
--- a/nodejs/autonomous/github-trending/README.md
+++ b/nodejs/autonomous/github-trending/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Autonomous Agent — Node.js Sample"
+page_type: sample
+languages:
+- typescript
+products:
+- agent-365
+description: "Run an autonomous TypeScript agent that summarizes trending GitHub repositories with Azure OpenAI and Agent 365 tracing."
+---
+-->
+
 # Autonomous Agent — Node.js Sample
 
 This sample demonstrates a **purely autonomous agent** built with the Microsoft Agent 365 SDK for Node.js/TypeScript. It has **no chat functionality** — it runs entirely as a background service.
diff --git a/nodejs/claude/sample-agent/README.md b/nodejs/claude/sample-agent/README.md
index a16b44dc..9a60b8ac 100644
--- a/nodejs/claude/sample-agent/README.md
+++ b/nodejs/claude/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Claude Sample Agent - Node.js"
+page_type: sample
+languages:
+- typescript
+products:
+- agent-365
+description: "Build a Claude agent in TypeScript with Agent 365 observability, notifications, and MCP tools."
+---
+-->
+
 # Claude Sample Agent - Node.js
 
 
diff --git a/nodejs/copilot-studio/sample-agent/README.md b/nodejs/copilot-studio/sample-agent/README.md
index 4da236f4..39291ac9 100644
--- a/nodejs/copilot-studio/sample-agent/README.md
+++ b/nodejs/copilot-studio/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Copilot Studio Sample Agent - Node.js"
+page_type: sample
+languages:
+- typescript
+products:
+- agent-365
+description: "Bridge a Microsoft Copilot Studio agent to Agent 365 with TypeScript hosting, notifications, and observability."
+---
+-->
+
 # Copilot Studio Sample Agent - Node.js
 
 
diff --git a/nodejs/devin/sample-agent/README.md b/nodejs/devin/sample-agent/README.md
index c594db82..f11d5782 100644
--- a/nodejs/devin/sample-agent/README.md
+++ b/nodejs/devin/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Devin Sample Agent - Node.js"
+page_type: sample
+languages:
+- typescript
+products:
+- agent-365
+description: "Integrate Devin with a TypeScript agent using Agent 365 observability and notifications."
+---
+-->
+
 # Devin Sample Agent - Node.js
 
 
@@ -5,7 +17,6 @@ This sample demonstrates how to build an agent using Devin in Node.js with the M
 
 - **Observability**: End-to-end tracing, caching, and monitoring for agent applications
 - **Notifications**: Services and models for managing user notifications
-- **Tools**: Model Context Protocol tools for building advanced agent solutions
 - **Hosting Patterns**: Hosting with Microsoft 365 Agents SDK
 
 This sample uses the [Microsoft Agent 365 SDK for Node.js](https://github.com/microsoft/Agent365-nodejs).
diff --git a/nodejs/langchain/quickstart-before/README.md b/nodejs/langchain/quickstart-before/README.md
index dfbe1021..660eec72 100644
--- a/nodejs/langchain/quickstart-before/README.md
+++ b/nodejs/langchain/quickstart-before/README.md
@@ -5,7 +5,7 @@ This directory contains a quickstart agent implementation using Node.js and Lang
 ## Demonstrates
 
 This sample is used to demonstrate how to build an agent using the Microsoft Agent 365 SDK with Node.js and LangChain. The sample includes basic LangChain Agent SDK usage hosted with Agents SDK that is testable on [agentsplayground](https://learn.microsoft.com/en-us/microsoft-365/agents-sdk/test-with-toolkit-project?tabs=windows).
-Please refer to this [quickstart guide](https://review.learn.microsoft.com/en-us/microsoft-agent-365/developer/quickstart-nodejs-langchain?branch=main) on how to extend your agent using Microsoft Agent 365 SDK.
+Please refer to this [quickstart guide](https://learn.microsoft.com/en-us/microsoft-agent-365/developer/quickstart-nodejs-langchain) on how to extend your agent using Microsoft Agent 365 SDK.
 
 ## Prerequisites
 
diff --git a/nodejs/langchain/sample-agent/README.md b/nodejs/langchain/sample-agent/README.md
index 9b40123b..85dc060b 100644
--- a/nodejs/langchain/sample-agent/README.md
+++ b/nodejs/langchain/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "LangChain Sample Agent - Node.js"
+page_type: sample
+languages:
+- typescript
+products:
+- agent-365
+description: "Build a LangChain agent in TypeScript with Agent 365 observability, notifications, and MCP tools."
+---
+-->
+
 # LangChain Sample Agent - Node.js
 
 
diff --git a/nodejs/n8n/sample-agent/README.md b/nodejs/n8n/sample-agent/README.md
index 4fe81624..4cdd6a08 100644
--- a/nodejs/n8n/sample-agent/README.md
+++ b/nodejs/n8n/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "n8n Sample Agent"
+page_type: sample
+languages:
+- javascript
+products:
+- agent-365
+description: "Create an n8n workflow agent using its Microsoft Agent 365 node for observability, notifications, and MCP tools."
+---
+-->
+
 # n8n Sample Agent
 
 This sample demonstrates how to build an agent using n8n with its Microsoft Agent 365 node. The new Microsoft Agent 365 node in n8n has built-in:
diff --git a/nodejs/openai/sample-agent/README.md b/nodejs/openai/sample-agent/README.md
index 60206514..2bfdac37 100644
--- a/nodejs/openai/sample-agent/README.md
+++ b/nodejs/openai/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "OpenAI Sample Agent - Node.js"
+page_type: sample
+languages:
+- typescript
+products:
+- agent-365
+description: "Build an OpenAI agent in TypeScript with Agent 365 observability, notifications, and MCP tools."
+---
+-->
+
 # OpenAI Sample Agent - Node.js
 
 
diff --git a/nodejs/perplexity/sample-agent/README.md b/nodejs/perplexity/sample-agent/README.md
index af27131b..fba44a4e 100644
--- a/nodejs/perplexity/sample-agent/README.md
+++ b/nodejs/perplexity/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Perplexity Sample Agent - Node.js"
+page_type: sample
+languages:
+- typescript
+products:
+- agent-365
+description: "Build a Perplexity agent in TypeScript with Agent 365 observability."
+---
+-->
+
 # Perplexity Sample Agent - Node.js
 
 
diff --git a/nodejs/vercel-sdk/sample-agent/README.md b/nodejs/vercel-sdk/sample-agent/README.md
index 9ff6eb39..d1e6bae7 100644
--- a/nodejs/vercel-sdk/sample-agent/README.md
+++ b/nodejs/vercel-sdk/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Vercel AI SDK Sample Agent - Node.js"
+page_type: sample
+languages:
+- typescript
+products:
+- agent-365
+description: "Build a Vercel AI SDK agent in TypeScript with Agent 365 observability, notifications, and MCP tools."
+---
+-->
+
 # Vercel AI SDK Sample Agent - Node.js
 
 
diff --git a/python/agent-framework/sample-agent/README.md b/python/agent-framework/sample-agent/README.md
index bf8907ee..4b4b13cc 100644
--- a/python/agent-framework/sample-agent/README.md
+++ b/python/agent-framework/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Agent Framework Sample Agent - Python"
+page_type: sample
+languages:
+- python
+products:
+- agent-365
+description: "Build an Agent Framework agent in Python with Agent 365 observability, notifications, and MCP tools."
+---
+-->
+
 # Agent Framework Sample Agent - Python
 
 This sample demonstrates how to build an agent using Agent Framework in Python with the Microsoft Agent 365 SDK. It covers:
diff --git a/python/autonomous/github-trending/README.md b/python/autonomous/github-trending/README.md
index b250bc2a..fd1c19b0 100644
--- a/python/autonomous/github-trending/README.md
+++ b/python/autonomous/github-trending/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Autonomous Agent — Python Sample"
+page_type: sample
+languages:
+- python
+products:
+- agent-365
+description: "Run an autonomous Python agent that summarizes trending GitHub repositories with Azure OpenAI and Agent 365 tracing."
+---
+-->
+
 # Autonomous Agent — Python Sample
 
 This sample demonstrates a **purely autonomous agent** built with the Microsoft Agent 365 SDK for Python. It has **no chat functionality** — it runs entirely as a background service.
diff --git a/python/claude/sample-agent/README.md b/python/claude/sample-agent/README.md
index 8055e83e..c157e2a6 100644
--- a/python/claude/sample-agent/README.md
+++ b/python/claude/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Claude Sample Agent - Python"
+page_type: sample
+languages:
+- python
+products:
+- agent-365
+description: "Build a Python agent using the Claude Agent SDK with extended thinking, built-in tools, and Agent 365 integration."
+---
+-->
+
 # Claude Sample Agent - Python
 
 This directory contains a sample agent implementation using Python and Anthropic's Claude Agent SDK with extended thinking capabilities. This sample demonstrates how to build an agent using the Agent365 framework with Python and Claude Agent SDK. It covers:
diff --git a/python/crewai/sample_agent/README.md b/python/crewai/sample_agent/README.md
index 1ab43e88..f3615ba4 100644
--- a/python/crewai/sample_agent/README.md
+++ b/python/crewai/sample_agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "CrewAI Agent Sample - Python"
+page_type: sample
+languages:
+- python
+products:
+- agent-365
+description: "Build a CrewAI multi-agent weather and driving safety workflow with Agent 365 tracing, notifications, and MCP tools."
+---
+-->
+
 # CrewAI Agent Sample - Python
 
 This sample demonstrates how to build a multi-agent system using CrewAI while integrating with the Microsoft Agent 365 SDK. It mirrors the structure and hosting patterns of the AgentFramework/OpenAI Agent 365 samples, while preserving native CrewAI logic in `src/crew_agent/`.
diff --git a/python/google-adk/sample-agent/README.md b/python/google-adk/sample-agent/README.md
index 15b445a7..4f9581d3 100644
--- a/python/google-adk/sample-agent/README.md
+++ b/python/google-adk/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Google ADK Sample Agent - Python"
+page_type: sample
+languages:
+- python
+products:
+- agent-365
+description: "Build a Google ADK agent in Python with Agent 365 observability, notifications, and MCP tools."
+---
+-->
+
 # Google ADK Sample Agent - Python
 
 This sample demonstrates how to build an agent using Google ADK in Python with the Microsoft Agent 365 SDK. It covers:
diff --git a/python/observability-with-azure-monitor/README.md b/python/observability-with-azure-monitor/README.md
index 95e267f8..f88b5f38 100644
--- a/python/observability-with-azure-monitor/README.md
+++ b/python/observability-with-azure-monitor/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Observability — Agent 365 SDK alongside Azure Monitor"
+page_type: sample
+languages:
+- python
+products:
+- agent-365
+description: "Add Agent 365 observability to a Python app that already exports OpenTelemetry spans to Azure Monitor."
+---
+-->
+
 # Observability — Agent 365 SDK alongside Azure Monitor
 
 This sample shows how to add the [Microsoft Agent 365 Python SDK](https://github.com/microsoft/Agent365-python) to an app that **already** uses [Azure Monitor / Application Insights OpenTelemetry](https://learn.microsoft.com/azure/azure-monitor/app/opentelemetry-overview). After running this, both Azure Monitor and the Agent 365 backend receive your agent's spans.
diff --git a/python/observability-with-langgraph/README.md b/python/observability-with-langgraph/README.md
index fb6aa0f8..8b59f266 100644
--- a/python/observability-with-langgraph/README.md
+++ b/python/observability-with-langgraph/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Observability — Agent 365 SDK with LangGraph"
+page_type: sample
+languages:
+- python
+products:
+- agent-365
+description: "Add Agent 365 observability to a Python LangGraph agent while preserving its existing OpenTelemetry exporter."
+---
+-->
+
 # Observability — Agent 365 SDK with LangGraph
 
 This sample shows how to add the [Microsoft Agent 365 Python SDK](https://github.com/microsoft/Agent365-python) to a [LangGraph](https://langchain-ai.github.io/langgraph/) agent that **already** uses OpenTelemetry. After running this, both your existing exporter and the Agent 365 backend receive every span produced by the agent.
diff --git a/python/observability-with-otlp/README.md b/python/observability-with-otlp/README.md
index 5354a0d9..0843c810 100644
--- a/python/observability-with-otlp/README.md
+++ b/python/observability-with-otlp/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "Observability — Agent 365 SDK with manual OTel + manual instrumentation"
+page_type: sample
+languages:
+- python
+products:
+- agent-365
+description: "Instrument a Python agent manually with OpenTelemetry and Agent 365 tracing, with optional Agent 365 S2S export."
+---
+-->
+
 # Observability — Agent 365 SDK with manual OTel + manual instrumentation
 
 ## Optional A365 S2S export
diff --git a/python/openai/sample-agent/README.md b/python/openai/sample-agent/README.md
index 2445f517..2052a202 100644
--- a/python/openai/sample-agent/README.md
+++ b/python/openai/sample-agent/README.md
@@ -1,3 +1,15 @@
+<!--
+---
+name: "OpenAI Sample Agent - Python"
+page_type: sample
+languages:
+- python
+products:
+- agent-365
+description: "Build an OpenAI agent in Python with Agent 365 observability, notifications, and MCP tools."
+---
+-->
+
 # OpenAI Sample Agent - Python
 
 This sample demonstrates how to build an agent using OpenAI in Python with the Microsoft Agent 365 SDK. It covers: