diff --git a/.changeset/hot-lies-flash.md b/.changeset/hot-lies-flash.md
deleted file mode 100644
index dcd91e33e1..0000000000
--- a/.changeset/hot-lies-flash.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Add metadata to create message
diff --git a/.changeset/thick-streets-give.md b/.changeset/thick-streets-give.md
deleted file mode 100644
index 293ad8583c..0000000000
--- a/.changeset/thick-streets-give.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": minor
----
-
-Update `xaiModels` and `xaiDefaultModelId` in `src/shared/api.ts`
diff --git a/.changeset/v3.18.4.md b/.changeset/v3.18.4.md
deleted file mode 100644
index b6ed94af08..0000000000
--- a/.changeset/v3.18.4.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-"roo-cline": patch
----
-
-- Fix settings saving logic to ensure the saved settings are used (thanks @daniel-lxs!)
-- Fix handling BOM when user rejects apply_diff (thanks @avtc!)
-- Fix wrongfully clearing input on autoApprove (thanks @Ruakij!)
-- Fix correct spawnSync parameters for pnpm check in bootstrap.mjs (thanks @ChuKhaLi!)
-- Batch code segments when using ollama to report progress (thanks @daniel-lxs!)
-- Remove hardcoded line breaks in the about section (thanks @mrubens!)
-- Update xAI models and default model ID (thanks @PeterDaveHello!)
-- Add metadata to create message (thanks @dtrugman!)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 227691297b..4a2bf1195e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Roo Code Changelog
 
+## [3.18.4] - 2025-05-25
+
+- Fix codebase indexing settings saving and Ollama indexing (thanks @daniel-lxs!)
+- Fix handling BOM when user rejects apply_diff (thanks @avtc!)
+- Fix wrongfully clearing input on auto-approve (thanks @Ruakij!)
+- Fix correct spawnSync parameters for pnpm check in bootstrap.mjs (thanks @ChuKhaLi!)
+- Update xAI models and default model ID (thanks @PeterDaveHello!)
+- Add metadata to create message (thanks @dtrugman!)
+
 ## [3.18.3] - 2025-05-24
 
 - Add reasoning support for Claude 4 and Gemini 2.5 Flash on OpenRouter, plus a fix for o1-pro
diff --git a/src/package.json b/src/package.json
index c98d7f8537..c76298e59a 100644
--- a/src/package.json
+++ b/src/package.json
@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.18.3",
+	"version": "3.18.4",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",