diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3371eb1..b19fa66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,16 @@ instructions, because git commits are used to generate release notes:
+
+## v21.0.1 (2026-08-04)
+
+- [Improvement] `ANDROID_APP_VERSION` and `ANDROID_APP_REPOSITORY` values now set correctly in `Dockerfile` (by @CodeWithEmad)
+- [Feature] `ANDROID_APP_ID` introduced to set the `APPLICATION_ID` inside `tutor.yaml` (by @CodeWithEmad)
+
+- [Chore] Remove unnecessary hatch definition for version. (by @Abdul-Muqadim-Arbisoft)
+
+- [Feature] Make the Android app's `tutor.yaml` fully customisable from Tutor config (#48). All commonly tweaked fields (Firebase, Segment, Braze, Google, Microsoft, Facebook, Branch, agreement URLs, discovery/program settings, feature flags, etc.) are now exposed as `ANDROID_*` settings, and a new `android-tutor-yaml` patch lets plugins append or override any value in the rendered file. (by @Abdul-Muqadim-Arbisoft)
+
## v21.0.0 (2025-11-10)
diff --git a/changelog.d/20251105_200539_abdul.muqadim_upgrade_android_sdk_tools_api36.md b/changelog.d/20251105_200539_abdul.muqadim_upgrade_android_sdk_tools_api36.md
deleted file mode 100644
index 380f935..0000000
--- a/changelog.d/20251105_200539_abdul.muqadim_upgrade_android_sdk_tools_api36.md
+++ /dev/null
@@ -1 +0,0 @@
-- [Improvement] Upgraded Android build configuration to use latest SDK and API versions (`ANDROID_API_LEVEL=36`, `ANDROID_SDK_VERSION=13114758`) to ensure compatibility with the latest Android tools. (by @Abdul-Muqadim-Arbisoft)
diff --git a/changelog.d/20251105_201256_abdul.muqadim_fix_android_dockerfile_arm64_compatible.md b/changelog.d/20251105_201256_abdul.muqadim_fix_android_dockerfile_arm64_compatible.md
deleted file mode 100644
index fdc0673..0000000
--- a/changelog.d/20251105_201256_abdul.muqadim_fix_android_dockerfile_arm64_compatible.md
+++ /dev/null
@@ -1 +0,0 @@
-- [Bugfix] Fix Android build on Apple Silicon by forcing the base Docker image to use `linux/amd64`, ensuring Android SDK and Gradle tools run correctly across all platforms. (by @Abdul-Muqadim-Arbisoft)
\ No newline at end of file
diff --git a/changelog.d/20260113_122626_codewithemad_app_version.md b/changelog.d/20260113_122626_codewithemad_app_version.md
deleted file mode 100644
index 7f7d7e0..0000000
--- a/changelog.d/20260113_122626_codewithemad_app_version.md
+++ /dev/null
@@ -1,3 +0,0 @@
-
-- [Improvement] `ANDROID_APP_VERSION` and `ANDROID_APP_REPOSITORY` values now set correctly in `Dockerfile` (by @CodeWithEmad)
-- [Feature] `ANDROID_APP_ID` introduced to set the `APPLICATION_ID` inside `tutor.yaml` (by @CodeWithEmad)
\ No newline at end of file
diff --git a/changelog.d/20260127_133216_abdul.muqadim_remove_hatch_def.md b/changelog.d/20260127_133216_abdul.muqadim_remove_hatch_def.md
deleted file mode 100644
index 054111a..0000000
--- a/changelog.d/20260127_133216_abdul.muqadim_remove_hatch_def.md
+++ /dev/null
@@ -1 +0,0 @@
-- [chore] Remove unnecessary hatch definition for version. (by @Abdul-Muqadim-Arbisoft)
\ No newline at end of file
diff --git a/changelog.d/20260505_140711_abdul.muqadim_customizable_tutor_yaml.md b/changelog.d/20260505_140711_abdul.muqadim_customizable_tutor_yaml.md
deleted file mode 100644
index 31c312e..0000000
--- a/changelog.d/20260505_140711_abdul.muqadim_customizable_tutor_yaml.md
+++ /dev/null
@@ -1,2 +0,0 @@
-
-- [Feature] Make the Android app's `tutor.yaml` fully customisable from Tutor config (#48). All commonly tweaked fields (Firebase, Segment, Braze, Google, Microsoft, Facebook, Branch, agreement URLs, discovery/program settings, feature flags, etc.) are now exposed as `ANDROID_*` settings, and a new `android-tutor-yaml` patch lets plugins append or override any value in the rendered file. (by @Abdul-Muqadim-Arbisoft)
diff --git a/tutorandroid/__about__.py b/tutorandroid/__about__.py
index 9bfcca5..fa22df3 100644
--- a/tutorandroid/__about__.py
+++ b/tutorandroid/__about__.py
@@ -1 +1 @@
-__version__ = "21.0.0"
+__version__ = "21.0.1"