diff --git a/servers/Azure.Mcp.Server/CHANGELOG.md b/servers/Azure.Mcp.Server/CHANGELOG.md
index e8309409e0..26af569733 100644
--- a/servers/Azure.Mcp.Server/CHANGELOG.md
+++ b/servers/Azure.Mcp.Server/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 The Azure MCP Server updates automatically by default whenever a new release comes out 🚀. We ship updates twice a week on Tuesdays and Thursdays 😊
 
-## 2.0.0-beta.8 (Unreleased)
+## 2.0.0-beta.9 (Unreleased)
 
 ### Features Added
 
@@ -17,7 +17,6 @@ The Azure MCP Server updates automatically by default whenever a new release com
 ### Other Changes
 
 - Switched to the new `Azure.Monitor.Query.Logs` package to query logs from Azure Monitor. [[#1309](https://github.com/microsoft/mcp/pull/1309)]
-- Move Azure AI Best Practices tool into Best Practice namespace [[#1323](https://github.com/microsoft/mcp/pull/1323)]
 
 #### Dependency updates
 
@@ -25,6 +24,12 @@ The Azure MCP Server updates automatically by default whenever a new release com
 
 - Updated `Microsoft.Azure.Mcp.AzTypes.Internal.Compact` from `0.2.802` to `0.2.804`. [[#1348](https://github.com/microsoft/mcp/pull/1348)]
 
+## 2.0.0-beta.8 (2025-12-11)
+
+### Bugs Fixed
+
+- Fixed an issue where the AI Best Practices tool would get called instead of the Best Practices tool. [[#1323](https://github.com/microsoft/mcp/pull/1323)]
+
 ## 2.0.0-beta.7 (2025-11-25)
 
 ### Bugs Fixed
diff --git a/servers/Azure.Mcp.Server/src/Azure.Mcp.Server.csproj b/servers/Azure.Mcp.Server/src/Azure.Mcp.Server.csproj
index 7ccc36c4ba..d4375cc99b 100644
--- a/servers/Azure.Mcp.Server/src/Azure.Mcp.Server.csproj
+++ b/servers/Azure.Mcp.Server/src/Azure.Mcp.Server.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>2.0.0-beta.8</Version>
+    <Version>2.0.0-beta.9</Version>
     <CliName>azmcp</CliName>
     <AssemblyTitle>Azure MCP Server</AssemblyTitle>
     <Description>Azure MCP Server - Model Context Protocol implementation for Azure</Description>
diff --git a/servers/Azure.Mcp.Server/vscode/CHANGELOG.md b/servers/Azure.Mcp.Server/vscode/CHANGELOG.md
index c0ae4ae236..8952d7af5a 100644
--- a/servers/Azure.Mcp.Server/vscode/CHANGELOG.md
+++ b/servers/Azure.Mcp.Server/vscode/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 2.0.8 (2025-12-11) (pre-release)
+
+### Fixed
+
+- Fixed an issue where the AI Best Practices tool would get called instead of the Best Practices tool. [[#1323](https://github.com/microsoft/mcp/pull/1323)]
+
 ## 2.0.7 (2025-11-25) (pre-release)
 
 ### Changed