diff --git a/servers/Azure.Mcp.Server/CHANGELOG.md b/servers/Azure.Mcp.Server/CHANGELOG.md
index d97649f63d..692c54a042 100644
--- a/servers/Azure.Mcp.Server/CHANGELOG.md
+++ b/servers/Azure.Mcp.Server/CHANGELOG.md
@@ -2,15 +2,16 @@
 
 The Azure MCP Server updates automatically by default whenever a new release comes out 🚀. We ship updates twice a week on Tuesdays and Thursdays 😊
 
-## 3.0.0-beta.23 (Unreleased)
+## 3.0.0-beta.23 (2026-07-02)
 
 ### Features Added
 
-### Breaking Changes
+- Added the `resilience` toolset (Azure Resilience Management) with read-only `get` commands for goals (templates, assignments, resources), usage plans and enrollments, and recovery plans (plans, resources, jobs). [[#2948](https://github.com/microsoft/mcp/pull/2948)]
+- Added support for AVM pattern modules (`avm-ptn-*`) in the Azure Terraform `avm` tools. The `azureterraform avm list` tool now returns both resource and pattern modules, each tagged with a `moduleType` field, and `avm versions`/`avm get` work for pattern modules as well as resource modules. [[#2946](https://github.com/microsoft/mcp/pull/2946)]
 
-### Bugs Fixed
+### Breaking Changes
 
-### Other Changes
+- Removed unused parameters from Resource Health tools. [[#2952](https://github.com/microsoft/mcp/pull/2952)]
 
 ## 3.0.0-beta.22 (2026-06-30)
 
diff --git a/servers/Azure.Mcp.Server/changelog-entries/1782414691894.yaml b/servers/Azure.Mcp.Server/changelog-entries/1782414691894.yaml
deleted file mode 100644
index 4a3aeebfdb..0000000000
--- a/servers/Azure.Mcp.Server/changelog-entries/1782414691894.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-changes:
-  - section: "Breaking Changes"
-    description: "Removed unused parameters from Resource Health tools."
diff --git a/servers/Azure.Mcp.Server/changelog-entries/1782548815102.yaml b/servers/Azure.Mcp.Server/changelog-entries/1782548815102.yaml
deleted file mode 100644
index cc04a601c6..0000000000
--- a/servers/Azure.Mcp.Server/changelog-entries/1782548815102.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-changes:
-  - section: "Features Added"
-    description: "Added the 'resilience' toolset (Azure Resilience Management) with read-only 'get' commands for goals (templates, assignments, resources), usage plans and enrollments, and recovery plans (plans, resources, jobs)."
diff --git a/servers/Azure.Mcp.Server/changelog-entries/avm-pattern-modules.yaml b/servers/Azure.Mcp.Server/changelog-entries/avm-pattern-modules.yaml
deleted file mode 100644
index bfe2bd2357..0000000000
--- a/servers/Azure.Mcp.Server/changelog-entries/avm-pattern-modules.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-changes:
-  - section: "Features Added"
-    description: "Added support for AVM pattern modules (`avm-ptn-*`) in the Azure Terraform `avm` tools. The `azmcp azureterraform avm list` tool now returns both resource and pattern modules, each tagged with a `moduleType` field, and `avm versions`/`avm get` work for pattern modules as well as resource modules."
diff --git a/servers/Azure.Mcp.Server/vscode/CHANGELOG.md b/servers/Azure.Mcp.Server/vscode/CHANGELOG.md
index fff69137c3..3787b271bd 100644
--- a/servers/Azure.Mcp.Server/vscode/CHANGELOG.md
+++ b/servers/Azure.Mcp.Server/vscode/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Release History
 
+## 3.0.23 (2026-07-02) (pre-release)
+
+### Added
+
+- Added the `resilience` toolset (Azure Resilience Management) with read-only `get` commands for goals (templates, assignments, resources), usage plans and enrollments, and recovery plans (plans, resources, jobs). [[#2948](https://github.com/microsoft/mcp/pull/2948)]
+- Added support for AVM pattern modules (`avm-ptn-*`) in the Azure Terraform `avm` tools. The `azureterraform avm list` tool now returns both resource and pattern modules, each tagged with a `moduleType` field, and `avm versions`/`avm get` work for pattern modules as well as resource modules. [[#2946](https://github.com/microsoft/mcp/pull/2946)]
+
+### Changed
+
+- **Breaking:** Removed unused parameters from Resource Health tools. [[#2952](https://github.com/microsoft/mcp/pull/2952)]
+
 ## 3.0.22 (2026-06-30) (pre-release)
 
 ### Changed