diff --git a/.changeset/v3.36.4.md b/.changeset/v3.36.4.md
deleted file mode 100644
index 82c4c5e78e1..00000000000
--- a/.changeset/v3.36.4.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-"roo-cline": patch
----
-
-![3.36.4 Release - Error Details Modal](/releases/3.36.4-release.png)
-
-- Add error details modal with on-demand display for improved error visibility when debugging issues (PR #9985 by @roomote)
-- Fix: Prevent premature rawChunkTracker clearing for MCP tools, improving reliability of MCP tool streaming (PR #9993 by @daniel-lxs)
-- Fix: Filter out 429 rate limit errors from API error telemetry for cleaner metrics (PR #9987 by @daniel-lxs)
-- Fix: Correct TODO list display order in chat view to show items in proper sequence (PR #9991 by @roomote)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 964cc042ca9..0c72e0737b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Roo Code Changelog
 
+## [3.36.4] - 2025-12-10
+
+![3.36.4 Release - Error Details Modal](/releases/3.36.4-release.png)
+
+- Add error details modal with on-demand display for improved error visibility when debugging issues (PR #9985 by @roomote)
+- Fix: Prevent premature rawChunkTracker clearing for MCP tools, improving reliability of MCP tool streaming (PR #9993 by @daniel-lxs)
+- Fix: Filter out 429 rate limit errors from API error telemetry for cleaner metrics (PR #9987 by @daniel-lxs)
+- Fix: Correct TODO list display order in chat view to show items in proper sequence (PR #9991 by @roomote)
+
 ## [3.36.3] - 2025-12-09
 
 ![3.36.3 Release](/releases/3.36.3-release.png)
diff --git a/src/package.json b/src/package.json
index e296d91f833..2a804186b9d 100644
--- a/src/package.json
+++ b/src/package.json
@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.36.2",
+	"version": "3.36.4",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",