diff --git a/.changeset/v3.36.5.md b/.changeset/v3.36.5.md
deleted file mode 100644
index 4ccec357df7..00000000000
--- a/.changeset/v3.36.5.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-"roo-cline": patch
----
-
-![3.36.5 Release - Bug Fixes](/releases/3.36.5-release.png)
-
-- Fix: Handle empty Gemini responses and reasoning loops to prevent infinite retries (PR #10007 by @hannesrudolph)
-- Fix: Add missing tool_result blocks to prevent API errors when tool results are expected (PR #10015 by @daniel-lxs)
-- Fix: Filter orphaned tool_results when more results than tool_uses to prevent message validation errors (PR #10027 by @daniel-lxs)
-- Fix: Add general API endpoints for Z.ai provider (#9879 by @richtong, PR #9894 by @roomote)
-- Fix: Apply versioned settings on nightly builds (PR #9997 by @hannesrudolph)
-- Add: Toggle for Enter key behavior in chat input allowing users to configure whether Enter sends or creates new line (#8555 by @lmtr0, PR #10002 by @hannesrudolph)
-- Add: GPT-5.2 model to openai-native provider (PR #10024 by @hannesrudolph)
-- Add: App version to telemetry exception captures and filter 402 errors (PR #9996 by @daniel-lxs)
-- Remove: Glama provider (PR #9801 by @hannesrudolph)
-- Remove: Deprecated list_code_definition_names tool (PR #10005 by @hannesrudolph)
-- Update: @roo-code/types to v1.90.0 (PR #9998 by @cte)
-- Chore: Update roomotes.yml configuration (PR #10008 by @cte)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c72e0737b2..a0d7c0e843e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Roo Code Changelog
 
+## [3.36.5] - 2025-12-11
+
+![3.36.5 Release - GPT-5.2](/releases/3.36.5-release.png)
+
+- Add: GPT-5.2 model to openai-native provider (PR #10024 by @hannesrudolph)
+- Add: Toggle for Enter key behavior in chat input allowing users to configure whether Enter sends or creates new line (#8555 by @lmtr0, PR #10002 by @hannesrudolph)
+- Add: App version to telemetry exception captures and filter 402 errors (PR #9996 by @daniel-lxs)
+- Fix: Handle empty Gemini responses and reasoning loops to prevent infinite retries (PR #10007 by @hannesrudolph)
+- Fix: Add missing tool_result blocks to prevent API errors when tool results are expected (PR #10015 by @daniel-lxs)
+- Fix: Filter orphaned tool_results when more results than tool_uses to prevent message validation errors (PR #10027 by @daniel-lxs)
+- Fix: Add general API endpoints for Z.ai provider (#9879 by @richtong, PR #9894 by @roomote)
+- Fix: Apply versioned settings on nightly builds (PR #9997 by @hannesrudolph)
+- Remove: Glama provider (PR #9801 by @hannesrudolph)
+- Remove: Deprecated list_code_definition_names tool (PR #10005 by @hannesrudolph)
+
 ## [3.36.4] - 2025-12-10
 
 ![3.36.4 Release - Error Details Modal](/releases/3.36.4-release.png)
diff --git a/src/package.json b/src/package.json
index 2a804186b9d..8f6c9c087b4 100644
--- a/src/package.json
+++ b/src/package.json
@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.36.4",
+	"version": "3.36.5",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",