diff --git a/.changeset/v3.36.12.md b/.changeset/v3.36.12.md
deleted file mode 100644
index ec3e8e68e27..00000000000
--- a/.changeset/v3.36.12.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-"roo-cline": patch
----
-
-![3.36.12 Release - Better telemetry and Bedrock fixes](/releases/3.36.12-release.png)
-
-- Fix: Add userAgentAppId to Bedrock embedder for code indexing (#10165 by @jackrein, PR #10166 by @roomote)
-- Update OpenAI and Gemini tool preferences for improved model behavior (PR #10170 by @hannesrudolph)
-- Extract error messages from JSON payloads for better PostHog error grouping (PR #10163 by @daniel-lxs)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44bfaa103a9..d09e0f52af4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Roo Code Changelog
 
+## [3.36.12] - 2025-12-18
+
+![3.36.12 Release - Better telemetry and Bedrock fixes](/releases/3.36.12-release.png)
+
+- Fix: Add userAgentAppId to Bedrock embedder for code indexing (#10165 by @jackrein, PR #10166 by @roomote)
+- Update OpenAI and Gemini tool preferences for improved model behavior (PR #10170 by @hannesrudolph)
+- Extract error messages from JSON payloads for better PostHog error grouping (PR #10163 by @daniel-lxs)
+
 ## [3.36.11] - 2025-12-17
 
 ![3.36.11 Release - Native Tool Calling Enhancements](/releases/3.36.11-release.png)
diff --git a/src/package.json b/src/package.json
index d6e25ccecbb..1122e10d249 100644
--- a/src/package.json
+++ b/src/package.json
@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.36.11",
+	"version": "3.36.12",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",