diff --git a/.changes/v0.21.2.md b/.changes/v0.21.2.md
new file mode 100644
index 000000000000..ff99093f1767
--- /dev/null
+++ b/.changes/v0.21.2.md
@@ -0,0 +1,11 @@
+## v0.21.2 (2024-12-18)
+
+### ⚠️ Notice
+
+* This is a patch release, please also check [the full release note](https://github.com/TabbyML/tabby/releases/tag/v0.21.1) for 0.21.1.
+
+### 🧰 Fixed and Improvements
+
+* Adapt extension side changes in new versions.
+  - VSCode: 1.16.0
+  - IntelliJ Platform: 1.9.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55c02fdcbd47..a67d3532fa78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,27 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
+## v0.21.2 (2024-12-18)
+
+### ⚠️ Notice
+
+* This is a patch release, please also check [the full release note](https://github.com/TabbyML/tabby/releases/tag/v0.21.1) for 0.21.1.
+
+### 🧰 Fixed and Improvements
+
+* Adapt extension side changes in new versions.
+  - VSCode: 1.16.0
+  - IntelliJ Platform: 1.9.1
+
+## v0.21.1 (2024-12-09)
+
+### ⚠️ Notice
+
+* This is a patch release, please also check [the full release note](https://github.com/TabbyML/tabby/releases/tag/v0.21.0) for 0.21.
+
+### 🧰 Fixed and Improvements
+
+* Fixed Gitlab Context Provider.
 ## v0.21.0 (2024-12-02)
 
 ### Notice