diff --git a/CHANGELOG.md b/CHANGELOG.md
index 264cc58dad..39e49bf95e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,29 @@ instructions, because git commits are used to generate release notes:
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-21.0.8'></a>
+## v21.0.8 (2026-06-23)
+
+- [Feature] Persist lms and cms job logs (by @muhammadadeeltajamul)
+
+- [Bugfix] Compatibility with Fedora/SELinux systems: volume bind-mounts must indicate that they are shared between different containers. Otherwise, SELinux fails to mount them. (by @regisb)
+
+- [Improvement] Add a manually executable GitHub Action workflow to create version bump PRs for Major and Minor releases. (by @Danyal-Faheem)
+
+- [Feature] Add a TESTS filter to tutor to include smoke/integration tests for tutor core and plugins. (by @Danyal Faheem)
+- [Feature] Add a new `tutor local do tests <suite> --limit <service>` command to run tests aggregated across tutor core and plugins using the TESTS filter. (by @Danyal-Faheem)
+- [Feature] Add idempotent smoke tests to quickly verify that a newly launched tutor instance is working. (by @Danyal-Faheem)
+  - These smoke tests check for the following basic necessities:
+    - User Management and Authentication
+    - Course import, course creation
+    - User enrollment
+    - Basic healthchecks
+    - OAuth Application creation
+
+- [Improvement] Add a manually executable ci workflow to verify launch and smoke tests for local and k8s environments. (by @Danyal-Faheem)
+
+- [Improvement] Unpin kubernetes<36 constraint as the upstream authentication bug has been resolved.
+
 <a id='changelog-21.0.7'></a>
 ## v21.0.7 (2026-05-25)
 
diff --git a/changelog.d/20250526_persist_lms_cms_job_logs.md b/changelog.d/20250526_persist_lms_cms_job_logs.md
deleted file mode 100644
index f36435f8d1..0000000000
--- a/changelog.d/20250526_persist_lms_cms_job_logs.md
+++ /dev/null
@@ -1 +0,0 @@
-- [Feature] Persist lms and cms job logs (by @muhammadadeeltajamul)
\ No newline at end of file
diff --git a/changelog.d/20260526_124321_regis_fedora_selinux.md b/changelog.d/20260526_124321_regis_fedora_selinux.md
deleted file mode 100644
index 3513fc95a2..0000000000
--- a/changelog.d/20260526_124321_regis_fedora_selinux.md
+++ /dev/null
@@ -1 +0,0 @@
-- [Bugfix] Compatibility with Fedora/SELinux systems: volume bind-mounts must indicate that they are shared between different containers. Otherwise, SELinux fails to mount them. (by @regisb)
diff --git a/changelog.d/20260605_191327_danyalfaheem_add_versionbump_ci.md b/changelog.d/20260605_191327_danyalfaheem_add_versionbump_ci.md
deleted file mode 100644
index 2f4c622fd0..0000000000
--- a/changelog.d/20260605_191327_danyalfaheem_add_versionbump_ci.md
+++ /dev/null
@@ -1 +0,0 @@
-- [Improvement] Add a manually executable GitHub Action workflow to create version bump PRs for Major and Minor releases. (by @Danyal-Faheem)
\ No newline at end of file
diff --git a/changelog.d/20260605_191916_danyalfaheem_add_tests_filter.md b/changelog.d/20260605_191916_danyalfaheem_add_tests_filter.md
deleted file mode 100644
index 71758bdf59..0000000000
--- a/changelog.d/20260605_191916_danyalfaheem_add_tests_filter.md
+++ /dev/null
@@ -1,9 +0,0 @@
-- [Feature] Add a TESTS filter to tutor to include smoke/integration tests for tutor core and plugins. (by @Danyal Faheem)
-- [Feature] Add a new `tutor local do tests <suite> --limit <service>` command to run tests aggregated across tutor core and plugins using the TESTS filter. (by @Danyal-Faheem)
-- [Feature] Add idempotent smoke tests to quickly verify that a newly launched tutor instance is working. (by @Danyal-Faheem)
-  - These smoke tests check for the following basic necessities:
-    - User Management and Authentication
-    - Course import, course creation
-    - User enrollment
-    - Basic healthchecks
-    - OAuth Application creation
\ No newline at end of file
diff --git a/changelog.d/20260610_234115_danyalfaheem_add_tests_ci.md b/changelog.d/20260610_234115_danyalfaheem_add_tests_ci.md
deleted file mode 100644
index f0b01bce5e..0000000000
--- a/changelog.d/20260610_234115_danyalfaheem_add_tests_ci.md
+++ /dev/null
@@ -1 +0,0 @@
-- [Improvement] Add a manually executable ci workflow to verify launch and smoke tests for local and k8s environments. (by @Danyal-Faheem)
\ No newline at end of file
diff --git a/changelog.d/20260612_153210_danyalfaheem_unpin_kubernetes.md b/changelog.d/20260612_153210_danyalfaheem_unpin_kubernetes.md
deleted file mode 100644
index fc1294357f..0000000000
--- a/changelog.d/20260612_153210_danyalfaheem_unpin_kubernetes.md
+++ /dev/null
@@ -1 +0,0 @@
-- [Improvement] Unpin kubernetes<36 constraint as the upstream authentication bug has been resolved. 
\ No newline at end of file
diff --git a/tutor/__about__.py b/tutor/__about__.py
index e2fe48360f..b4c4acc2fb 100644
--- a/tutor/__about__.py
+++ b/tutor/__about__.py
@@ -2,7 +2,7 @@
 
 # Increment this version number to trigger a new release. See
 # docs/tutor.html#versioning for information on the versioning scheme.
-__version__ = "21.0.7"
+__version__ = "21.0.8"
 
 # The version suffix will be appended to the actual version, separated by a
 # dash. Use this suffix to differentiate between the actual released version and