diff --git a/.github/skills/changelog-generation/SKILL.md b/.github/skills/changelog-generation/SKILL.md
index 9435af59773..47ba16d9507 100644
--- a/.github/skills/changelog-generation/SKILL.md
+++ b/.github/skills/changelog-generation/SKILL.md
@@ -81,7 +81,7 @@ Per [references/pr-processing.md](references/pr-processing.md):
 
 ### Step 5 — Assemble & Review
 
-1. Remove any empty category sections from the new release entry.
+1. **Remove empty category sections** — scan the new release entry and delete any `### <Category>` heading that has no bullet entries beneath it (i.e., the next line is blank followed by another `###` heading or `##` heading or end of section). This is mandatory — never leave empty `### Breaking Changes`, `### Features Added`, `### Bugs Fixed`, or `### Other Changes` sections in the final output.
 2. For extensions using flat bullet lists (no category headings), match the existing style.
 3. Present the **complete changelog entry** to the user for review via `ask_user`.
 
diff --git a/cli/azd/CHANGELOG.md b/cli/azd/CHANGELOG.md
index 11b5493f3a4..8abbc9f5650 100644
--- a/cli/azd/CHANGELOG.md
+++ b/cli/azd/CHANGELOG.md
@@ -10,6 +10,34 @@
 
 ### Other Changes
 
+## 1.23.15 (2026-04-10)
+
+### Features Added
+
+- [[#7451]](https://github.com/Azure/azure-dev/pull/7451) Add Python hook support in `azure.yaml`; hooks pointing to a `.py` script are auto-detected and executed. When `requirements.txt` or `pyproject.toml` is present, a virtual environment is created and dependencies are installed automatically.
+- [[#7626]](https://github.com/Azure/azure-dev/pull/7626) Add JavaScript and TypeScript hook support in `azure.yaml`; hooks pointing to `.js` or `.ts` scripts are auto-detected, with automatic `npm install` from `package.json` when present. TypeScript scripts execute via `npx tsx` with no compile step required.
+
+### Breaking Changes
+
+- [[#7630]](https://github.com/Azure/azure-dev/pull/7630) Replace App Service slot auto-selection heuristics with explicit slot targeting: use `AZD_DEPLOY_{SERVICE}_SLOT_NAME=production` to deploy to the main app, or `AZD_DEPLOY_{SERVICE}_SLOT_NAME=<name>` for a specific slot. The previous auto-pick behavior (single slot present, no `SLOT_NAME` set, `--no-prompt`) and first-deploy push-to-all-slots behavior have been removed; `azd deploy` will now prompt interactively or error in non-interactive mode when slots are present and `SLOT_NAME` is not set.
+
+### Bugs Fixed
+
+- [[#7618]](https://github.com/Azure/azure-dev/pull/7618) Fix `azure.yaml` hook parsing failure when mixing single-hook (map) and multi-hook (list) formats in the same `hooks:` block.
+- [[#7629]](https://github.com/Azure/azure-dev/pull/7629) Fix `azd auth token` being killed by the background update check when invoked as a subprocess by extension credential providers; `azd auth token` and other fast-exit commands now skip the update check entirely.
+- [[#7578]](https://github.com/Azure/azure-dev/pull/7578) Fix tenant-specific re-authentication guidance for `AADSTS70043` and `AADSTS700082` errors; azd now returns guidance targeting the correct subscription tenant when a credential fails due to a stale refresh token.
+- [[#7549]](https://github.com/Azure/azure-dev/pull/7549) Fix `AZURE_PRINCIPAL_ID` resolution for guest and B2B users by resolving the principal identity in the subscription's resource tenant, and prefer the ARM token `oid` claim over a Microsoft Graph call to avoid incorrect RBAC assignments.
+- [[#7562]](https://github.com/Azure/azure-dev/pull/7562) Fix extension lifecycle event handlers being silently dropped when multiple extensions subscribe to the same lifecycle event.
+- [[#7501]](https://github.com/Azure/azure-dev/pull/7501) Fix AKS service target `postprovision` hook to skip gracefully when the AKS cluster has not been provisioned yet in a multi-phase workflow, instead of failing fatally.
+- [[#7555]](https://github.com/Azure/azure-dev/pull/7555) Fix Copilot error troubleshooting to skip AI analysis for timeout errors, mark Bicep missing-input and `azure.yaml` config validation errors as non-fixable, and apply a 5-minute guard timeout to AI analysis requests.
+
+### Other Changes
+
+- [[#7557]](https://github.com/Azure/azure-dev/pull/7557) Update bundled Bicep CLI to v0.42.1.
+- [[#7591]](https://github.com/Azure/azure-dev/pull/7591) Update `azd update` success message to a shorter, more actionable format.
+- [[#7536]](https://github.com/Azure/azure-dev/pull/7536) Filter deprecated AI model versions and retired SKUs from model selection prompts in the AI model service.
+- [[#7588]](https://github.com/Azure/azure-dev/pull/7588) Fix `copilot consent list` and `copilot consent revoke` `--action` flag to display correct valid values (`all`, `readonly`) in shell completion suggestions.
+
 ## 1.23.14 (2026-04-03)
 
 ### Features Added
diff --git a/cli/azd/pkg/azdext/version.go b/cli/azd/pkg/azdext/version.go
index 9978a448f20..ee10a2a6b78 100644
--- a/cli/azd/pkg/azdext/version.go
+++ b/cli/azd/pkg/azdext/version.go
@@ -6,4 +6,4 @@ package azdext
 // Version is the semantic version of the azdext SDK package.
 // This value mirrors the CLI version in cli/version.txt and is
 // automatically updated by eng/scripts/Update-CliVersion.ps1.
-const Version = "1.24.0-beta.1"
+const Version = "1.23.15"
diff --git a/cli/version.txt b/cli/version.txt
index 33fd5bab588..a97506c3be8 100644
--- a/cli/version.txt
+++ b/cli/version.txt
@@ -1 +1 @@
-1.24.0-beta.1
+1.23.15