diff --git a/.changes/unreleased/ENHANCEMENTS-20250915-111345.yaml b/.changes/unreleased/ENHANCEMENTS-20250915-111345.yaml
deleted file mode 100644
index 829442e2cf..0000000000
--- a/.changes/unreleased/ENHANCEMENTS-20250915-111345.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: ENHANCEMENTS
-body: Added telemetry event start mcp server
-time: 2025-09-15T11:13:45.094881+05:30
-custom:
-    Issue: "2116"
-    Repository: vscode-terraform
diff --git a/.changes/unreleased/ENHANCEMENTS-20250917-154150.yaml b/.changes/unreleased/ENHANCEMENTS-20250917-154150.yaml
deleted file mode 100644
index 015a547609..0000000000
--- a/.changes/unreleased/ENHANCEMENTS-20250917-154150.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: ENHANCEMENTS
-body: Updated documentation regarding default MCP server state.
-time: 2025-09-17T15:41:50.306114127Z
-custom:
-    Issue: "2121"
-    Repository: vscode-terraform
diff --git a/.changes/v2.36.4.md b/.changes/v2.36.4.md
new file mode 100644
index 0000000000..a5a2d951b3
--- /dev/null
+++ b/.changes/v2.36.4.md
@@ -0,0 +1,10 @@
+## 2.36.4 (2025-09-18)
+
+ENHANCEMENTS:
+
+* Added telemetry event start mcp server ([#2116](https://github.com/hashicorp/vscode-terraform/issues/2116))
+
+NOTES:
+
+* Updated documentation regarding default MCP server state. ([#2121](https://github.com/hashicorp/vscode-terraform/issues/2121))
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad559bea7f..21e0290db1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.36.4 (2025-09-18)
+
+ENHANCEMENTS:
+
+* Added telemetry event start mcp server ([#2116](https://github.com/hashicorp/vscode-terraform/issues/2116))
+
+NOTES:
+
+* Updated documentation regarding default MCP server state. ([#2121](https://github.com/hashicorp/vscode-terraform/issues/2121))
+
 ## 2.36.3 (2025-09-17)
 
 ENHANCEMENTS:
diff --git a/package-lock.json b/package-lock.json
index 8cc4ec7ad0..5e08ac1d50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "terraform",
-  "version": "2.36.3",
+  "version": "2.36.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "terraform",
-      "version": "2.36.3",
+      "version": "2.36.4",
       "license": "MPL-2.0",
       "dependencies": {
         "@vscode/extension-telemetry": "^0.9.8",
diff --git a/package.json b/package.json
index 61a4264628..3d99be3a8e 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "name": "terraform",
   "displayName": "HashiCorp Terraform",
   "description": "Syntax highlighting and autocompletion for Terraform",
-  "version": "2.36.3",
+  "version": "2.36.4",
   "publisher": "hashicorp",
   "appInsightsKey": "InstrumentationKey=885372d2-6f3c-499f-9d25-b8b219983a52;IngestionEndpoint=https://westus2-1.in.applicationinsights.azure.com/;LiveEndpoint=https://westus2.livediagnostics.monitor.azure.com/;ApplicationId=6734158a-8ab9-4aec-9b5a-af151d14a754",
   "license": "MPL-2.0",