diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5aebe9f..38a83e65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+
+- Added component filtering based on env var `SPIN_COMPONENTS_TO_RETAIN` ([#197](https://github.com/spinkube/containerd-shim-spin/pull/197))
+
+### Changed
+
+- Turn off native unwinding from Wasmtime Config to avoid faulty libunwind detection errors ([#215](https://github.com/spinkube/containerd-shim-spin/pull/215))
+
+### Fixed
+
+- Fixed [#216](https://github.com/spinkube/containerd-shim-spin/issues/216): Spin state dir not being created
+- FIxed CI errors due to old versions of Go and TinyGo and disk pressure ([#217](https://github.com/spinkube/containerd-shim-spin/pull/217))
+
+
+
 ## [v0.16.0](https://github.com/spinkube/containerd-shim-spin/releases/tag/v0.16.0) - 2024-10-04
 
 ### Added
@@ -27,4 +44,5 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 ---
 
-v0.16.0: https://github.com/spinkube/containerd-shim-spin/compare/v0.15.1...v0.16.0
+[Unreleased]: <https://github.com/spinkube/containerd-shim-spin/compare/v0.16.0..HEAD>
+[v0.16.0]: https://github.com/spinkube/containerd-shim-spin/compare/v0.15.1...v0.16.0