diff --git a/.changeset/calm-berries-poke.md b/.changeset/calm-berries-poke.md
deleted file mode 100644
index 5c761e06231..00000000000
--- a/.changeset/calm-berries-poke.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-v3.3.18
diff --git a/.changeset/fair-boxes-smile.md b/.changeset/fair-boxes-smile.md
deleted file mode 100644
index d4b770b6831..00000000000
--- a/.changeset/fair-boxes-smile.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Make sure that we fire the onBlur for edited fields when the user hits Done in settings
diff --git a/.changeset/funny-bananas-sneeze.md b/.changeset/funny-bananas-sneeze.md
deleted file mode 100644
index 773e9b577bb..00000000000
--- a/.changeset/funny-bananas-sneeze.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Fix issue where Ollama/LMStudio URLs would flicker back to previous while entering
diff --git a/.changeset/moody-fans-build.md b/.changeset/moody-fans-build.md
deleted file mode 100644
index 7f0a74a94d9..00000000000
--- a/.changeset/moody-fans-build.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Fix logic error in retry delays
diff --git a/.changeset/polite-lizards-rhyme.md b/.changeset/polite-lizards-rhyme.md
deleted file mode 100644
index 690b9007438..00000000000
--- a/.changeset/polite-lizards-rhyme.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Hide advanced openrouter config in the welcome view
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97b1d998e17..fada04ba4d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Roo Code Changelog
 
+## [3.3.18]
+
+- Add a per-API-configuration model temperature setting (thanks @joemanley201!)
+- Add retries for fetching usage stats from OpenRouter (thanks @jcbdev!)
+- Fix bug where disabled MCP servers would not show up in the settings on initialization (thanks @MuriloFP!)
+- Add the Requesty provider and clean up a lot of shared model picker code (thanks @samhvw8!)
+- Add a button on the Prompts tab to copy the full system prompt to the clipboard (thanks @mamertofabian!)
+- Fix issue where Ollama/LMStudio URLs would flicker back to previous while entering them in settings
+- Fix logic error where automatic retries were waiting twice as long as intended
+- Rework the checkpoints code to avoid conflicts with file locks on Windows (sorry for the hassle!)
+
 ## [3.3.17]
 
 - Fix the restore checkpoint popover
diff --git a/package-lock.json b/package-lock.json
index bd7dbf16e46..eeea392e2fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "roo-cline",
-	"version": "3.3.17",
+	"version": "3.3.18",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "roo-cline",
-			"version": "3.3.17",
+			"version": "3.3.18",
 			"dependencies": {
 				"@anthropic-ai/bedrock-sdk": "^0.10.2",
 				"@anthropic-ai/sdk": "^0.26.0",
diff --git a/package.json b/package.json
index 8dce97faf6b..b87b640e0d8 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
 	"displayName": "Roo Code (prev. Roo Cline)",
 	"description": "A VS Code plugin that enhances coding with AI-powered automation, multi-model support, and experimental features.",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.3.17",
+	"version": "3.3.18",
 	"icon": "assets/icons/rocket.png",
 	"galleryBanner": {
 		"color": "#617A91",