diff --git a/.changes/unreleased/BUG FIXES-20241203-144106.yaml b/.changes/unreleased/BUG FIXES-20241203-144106.yaml
deleted file mode 100644
index 6b3c4d9d2..000000000
--- a/.changes/unreleased/BUG FIXES-20241203-144106.yaml	
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: BUG FIXES
-body: Fix incorrect validation for heterogeneous list
-time: 2024-12-03T14:41:06.889146+01:00
-custom:
-    Issue: "1884"
-    Repository: terraform-ls
diff --git a/.changes/unreleased/BUG FIXES-20241209-151045.yaml b/.changes/unreleased/BUG FIXES-20241209-151045.yaml
deleted file mode 100644
index de9fbfe01..000000000
--- a/.changes/unreleased/BUG FIXES-20241209-151045.yaml	
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: BUG FIXES
-body: Fix incorrect validation of references by correctly detecting tuple and object expressions created from for-expressions
-time: 2024-12-09T15:10:45.0655+01:00
-custom:
-    Issue: "1890"
-    Repository: terraform-ls
diff --git a/.changes/unreleased/ENHANCEMENTS-20241028-090453.yaml b/.changes/unreleased/ENHANCEMENTS-20241028-090453.yaml
deleted file mode 100644
index 0a936d03b..000000000
--- a/.changes/unreleased/ENHANCEMENTS-20241028-090453.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: ENHANCEMENTS
-body: 'Stacks: parse terraform-sources.json to support remote component sources'
-time: 2024-10-28T09:04:53.004252+01:00
-custom:
-    Issue: "1836"
-    Repository: terraform-ls
diff --git a/.changes/unreleased/INTERNAL-20241120-134148.yaml b/.changes/unreleased/INTERNAL-20241120-134148.yaml
deleted file mode 100644
index 9b212c562..000000000
--- a/.changes/unreleased/INTERNAL-20241120-134148.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: INTERNAL
-body: Add Heimdall metadata
-time: 2024-11-20T13:41:48.024126-05:00
-custom:
-    Issue: "1874"
-    Repository: terraform-ls
diff --git a/.changes/unreleased/INTERNAL-20241128-145742.yaml b/.changes/unreleased/INTERNAL-20241128-145742.yaml
deleted file mode 100644
index 6df8c856e..000000000
--- a/.changes/unreleased/INTERNAL-20241128-145742.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: INTERNAL
-body: Add tests for Stacks feature
-time: 2024-11-28T14:57:42.823414+01:00
-custom:
-    Issue: "1879"
-    Repository: terraform-ls
diff --git a/.changes/unreleased/INTERNAL-20241128-173155.yaml b/.changes/unreleased/INTERNAL-20241128-173155.yaml
deleted file mode 100644
index 10f4b2f80..000000000
--- a/.changes/unreleased/INTERNAL-20241128-173155.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: INTERNAL
-body: Fix flaky `workspace/symbol` tests
-time: 2024-11-28T17:31:55.311726+01:00
-custom:
-    Issue: "1880"
-    Repository: terraform-ls
diff --git a/.changes/unreleased/INTERNAL-20241202-134258.yaml b/.changes/unreleased/INTERNAL-20241202-134258.yaml
deleted file mode 100644
index b68cbf720..000000000
--- a/.changes/unreleased/INTERNAL-20241202-134258.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: INTERNAL
-body: Fix flaky initialize handler tests
-time: 2024-12-02T13:42:58.677986+01:00
-custom:
-    Issue: "1883"
-    Repository: terraform-ls
diff --git a/.changes/v0.36.1.md b/.changes/v0.36.1.md
new file mode 100644
index 000000000..8bfc11e33
--- /dev/null
+++ b/.changes/v0.36.1.md
@@ -0,0 +1,18 @@
+## 0.36.1 (10 December 2024)
+
+ENHANCEMENTS:
+
+* Stacks: parse terraform-sources.json to support remote component sources ([#1836](https://github.com/hashicorp/terraform-ls/issues/1836))
+
+BUG FIXES:
+
+* Fix incorrect validation for heterogeneous list ([#1884](https://github.com/hashicorp/terraform-ls/issues/1884))
+* Fix incorrect validation of references by correctly detecting tuple and object expressions created from for-expressions ([#1890](https://github.com/hashicorp/terraform-ls/issues/1890))
+
+INTERNAL:
+
+* Add Heimdall metadata ([#1874](https://github.com/hashicorp/terraform-ls/issues/1874))
+* Add tests for Stacks feature ([#1879](https://github.com/hashicorp/terraform-ls/issues/1879))
+* Fix flaky `workspace/symbol` tests ([#1880](https://github.com/hashicorp/terraform-ls/issues/1880))
+* Fix flaky initialize handler tests ([#1883](https://github.com/hashicorp/terraform-ls/issues/1883))
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7737ea031..cd668a90a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 0.36.1 (10 December 2024)
+
+ENHANCEMENTS:
+
+* Stacks: parse terraform-sources.json to support remote component sources ([#1836](https://github.com/hashicorp/terraform-ls/issues/1836))
+
+BUG FIXES:
+
+* Fix incorrect validation for heterogeneous list ([#1884](https://github.com/hashicorp/terraform-ls/issues/1884))
+* Fix incorrect validation of references by correctly detecting tuple and object expressions created from for-expressions ([#1890](https://github.com/hashicorp/terraform-ls/issues/1890))
+
+INTERNAL:
+
+* Add Heimdall metadata ([#1874](https://github.com/hashicorp/terraform-ls/issues/1874))
+* Add tests for Stacks feature ([#1879](https://github.com/hashicorp/terraform-ls/issues/1879))
+* Fix flaky `workspace/symbol` tests ([#1880](https://github.com/hashicorp/terraform-ls/issues/1880))
+* Fix flaky initialize handler tests ([#1883](https://github.com/hashicorp/terraform-ls/issues/1883))
+
 ## 0.36.0 (15 November 2024)
 
 ENHANCEMENTS:
diff --git a/version/VERSION b/version/VERSION
index 93d4c1ef0..19199bcca 100644
--- a/version/VERSION
+++ b/version/VERSION
@@ -1 +1 @@
-0.36.0
+0.36.1