diff --git a/release-notes/8.0.0/3139.md b/release-notes/3139.md
similarity index 100%
rename from release-notes/8.0.0/3139.md
rename to release-notes/3139.md
diff --git a/release-notes/8.0.0/3285.md b/release-notes/3285.md
similarity index 100%
rename from release-notes/8.0.0/3285.md
rename to release-notes/3285.md
diff --git a/release-notes/8.0.0/feat/3307.md b/release-notes/3307.md
similarity index 100%
rename from release-notes/8.0.0/feat/3307.md
rename to release-notes/3307.md
diff --git a/release-notes/8.0.0/3334.md b/release-notes/3334.md
similarity index 100%
rename from release-notes/8.0.0/3334.md
rename to release-notes/3334.md
diff --git a/release-notes/8.0.0/feat/3337.md b/release-notes/3337.md
similarity index 100%
rename from release-notes/8.0.0/feat/3337.md
rename to release-notes/3337.md
diff --git a/release-notes/8.0.0/fix/3363.md b/release-notes/3363.md
similarity index 100%
rename from release-notes/8.0.0/fix/3363.md
rename to release-notes/3363.md
diff --git a/release-notes/8.0.0/3383.md b/release-notes/3383.md
similarity index 100%
rename from release-notes/8.0.0/3383.md
rename to release-notes/3383.md
diff --git a/release-notes/8.0.0/3414.md b/release-notes/3414.md
similarity index 100%
rename from release-notes/8.0.0/3414.md
rename to release-notes/3414.md
diff --git a/release-notes/8.0.0/fix/3430.md b/release-notes/3430.md
similarity index 100%
rename from release-notes/8.0.0/fix/3430.md
rename to release-notes/3430.md
diff --git a/release-notes/8.0.0/feat/3434.md b/release-notes/3434.md
similarity index 100%
rename from release-notes/8.0.0/feat/3434.md
rename to release-notes/3434.md
diff --git a/release-notes/8.0.0/fix/3442.md b/release-notes/3442.md
similarity index 100%
rename from release-notes/8.0.0/fix/3442.md
rename to release-notes/3442.md
diff --git a/release-notes/8.0.0/3616.md b/release-notes/3616.md
similarity index 100%
rename from release-notes/8.0.0/3616.md
rename to release-notes/3616.md
diff --git a/release-notes/8.0.0/feat/3642.md b/release-notes/3642.md
similarity index 100%
rename from release-notes/8.0.0/feat/3642.md
rename to release-notes/3642.md
diff --git a/release-notes/8.0.0/feat/3654.md b/release-notes/3654.md
similarity index 100%
rename from release-notes/8.0.0/feat/3654.md
rename to release-notes/3654.md
diff --git a/release-notes/8.0.0/feat/3723.md b/release-notes/3723.md
similarity index 100%
rename from release-notes/8.0.0/feat/3723.md
rename to release-notes/3723.md
diff --git a/release-notes/8.0.0/3724.md b/release-notes/3724.md
similarity index 100%
rename from release-notes/8.0.0/3724.md
rename to release-notes/3724.md
diff --git a/release-notes/3729.md b/release-notes/3729.md
new file mode 100644
index 000000000..e44207e3b
--- /dev/null
+++ b/release-notes/3729.md
@@ -0,0 +1,2 @@
+- feat: [PR](https://github.com/go-gitea/gitea/pull/30874): add actions-artifacts to the [storage migrate CLI](https://forgejo.org/docs/v8.0/admin/command-line/#migrate).
+- fix: [PR](https://github.com/go-gitea/gitea/pull/30715): pull request search shows closed pull requests in the open tab
diff --git a/release-notes/8.0.0/feat/3791.md b/release-notes/3791.md
similarity index 100%
rename from release-notes/8.0.0/feat/3791.md
rename to release-notes/3791.md
diff --git a/release-notes/8.0.0/feat/3808.md b/release-notes/3808.md
similarity index 100%
rename from release-notes/8.0.0/feat/3808.md
rename to release-notes/3808.md
diff --git a/release-notes/8.0.0/3811.md b/release-notes/3811.md
similarity index 100%
rename from release-notes/8.0.0/3811.md
rename to release-notes/3811.md
diff --git a/release-notes/8.0.0/3830.md b/release-notes/3830.md
similarity index 100%
rename from release-notes/8.0.0/3830.md
rename to release-notes/3830.md
diff --git a/release-notes/8.0.0/feat/3836.md b/release-notes/3836.md
similarity index 100%
rename from release-notes/8.0.0/feat/3836.md
rename to release-notes/3836.md
diff --git a/release-notes/8.0.0/feat/3838.md b/release-notes/3838.md
similarity index 100%
rename from release-notes/8.0.0/feat/3838.md
rename to release-notes/3838.md
diff --git a/release-notes/8.0.0/feat/3847.md b/release-notes/3847.md
similarity index 100%
rename from release-notes/8.0.0/feat/3847.md
rename to release-notes/3847.md
diff --git a/release-notes/8.0.0/feat/3870.md b/release-notes/3870.md
similarity index 100%
rename from release-notes/8.0.0/feat/3870.md
rename to release-notes/3870.md
diff --git a/release-notes/8.0.0/feat/3886.md b/release-notes/3886.md
similarity index 100%
rename from release-notes/8.0.0/feat/3886.md
rename to release-notes/3886.md
diff --git a/release-notes/8.0.0/feat/3917.md b/release-notes/3917.md
similarity index 100%
rename from release-notes/8.0.0/feat/3917.md
rename to release-notes/3917.md
diff --git a/release-notes/3922.md b/release-notes/3922.md
new file mode 100644
index 000000000..d05a78dd8
--- /dev/null
+++ b/release-notes/3922.md
@@ -0,0 +1,5 @@
+- feat:  [`1e983e7`](https://github.com/alecthomas/chroma/commit/1e983e7) lexers/cue: support CUE attributes ([#​961](https://github.com/alecthomas/chroma/issues/961))
+- feat:  [`9347b55`](https://github.com/alecthomas/chroma/commit/9347b55) Add Gleam syntax highlighting ([#​959](https://github.com/alecthomas/chroma/issues/959))
+- feat:  [`2580aaa`](https://github.com/alecthomas/chroma/commit/2580aaa) Add Bazel bzlmod support into Python lexer ([#​947](https://github.com/alecthomas/chroma/issues/947))
+- fix:  [`736c0ea`](https://github.com/alecthomas/chroma/commit/736c0ea) Typescript: Several fixes ([#​952](https://github.com/alecthomas/chroma/issues/952))
+- fix:  [`e5c25d0`](https://github.com/alecthomas/chroma/commit/e5c25d0) Org: Keep all newlines ([#​951](https://github.com/alecthomas/chroma/issues/951))
diff --git a/release-notes/8.0.0/3934.md b/release-notes/3934.md
similarity index 100%
rename from release-notes/8.0.0/3934.md
rename to release-notes/3934.md
diff --git a/release-notes/8.0.0/feat/3985.md b/release-notes/3985.md
similarity index 100%
rename from release-notes/8.0.0/feat/3985.md
rename to release-notes/3985.md
diff --git a/release-notes/3989.md b/release-notes/3989.md
new file mode 100644
index 000000000..452407c05
--- /dev/null
+++ b/release-notes/3989.md
@@ -0,0 +1,5 @@
+- feat: API endpoints that return a repository now [also include the topics](https://codeberg.org/forgejo/forgejo/commit/ee2247d77c0b13b0b45df704d7589b541db03899)
+- feat: Display an error when an issue comment is [edited simultaneously by two users](https://codeberg.org/forgejo/forgejo/commit/ca0921a95aa9a37d8820538458c15fd0a3b0c97c) instead of silently overriding one of them
+- feat: Add [support for a credentials chain for minio](https://codeberg.org/forgejo/forgejo/commit/73706ae26d138684ef9da9e1164846a040fd4a7d)
+- feat: [Rename project board into column](https://codeberg.org/forgejo/forgejo/commit/a7591f9738dbefb2dcddeb2d45175abee3d03c1f) because it was confusing to users
+- feat(perf): improve performances when [retrieving pull requests via the API](https://codeberg.org/forgejo/forgejo/commit/47a2102694c47bc30a2a7c673c328471839ef206)
diff --git a/release-notes/8.0.0/fix/4026.md b/release-notes/4026.md
similarity index 100%
rename from release-notes/8.0.0/fix/4026.md
rename to release-notes/4026.md
diff --git a/release-notes/8.0.0/feat/4027.md b/release-notes/4027.md
similarity index 100%
rename from release-notes/8.0.0/feat/4027.md
rename to release-notes/4027.md
diff --git a/release-notes/4072.md b/release-notes/4072.md
new file mode 100644
index 000000000..3f3b655f3
--- /dev/null
+++ b/release-notes/4072.md
@@ -0,0 +1,2 @@
+- Added Enter key handling to the new Markdown editor ([#4072](https://codeberg.org/forgejo/forgejo/pulls/4072)): Pressing Enter while in a list, quote or code block will copy the prefix to the new line - Ordered list index will be increased for the new line, and task list "checkbox" will be unchecked.
+- Added indent/unindent function for a line or selection. Currently available as toolbar buttons ([#4263](https://codeberg.org/forgejo/forgejo/pulls/4263))
diff --git a/release-notes/8.0.0/feat/4083.md b/release-notes/4083.md
similarity index 100%
rename from release-notes/8.0.0/feat/4083.md
rename to release-notes/4083.md
diff --git a/release-notes/8.0.0/4095.md b/release-notes/4095.md
similarity index 100%
rename from release-notes/8.0.0/4095.md
rename to release-notes/4095.md
diff --git a/release-notes/8.0.0/feat/4134.md b/release-notes/4134.md
similarity index 100%
rename from release-notes/8.0.0/feat/4134.md
rename to release-notes/4134.md
diff --git a/release-notes/8.0.0/feat/4136.md b/release-notes/4136.md
similarity index 100%
rename from release-notes/8.0.0/feat/4136.md
rename to release-notes/4136.md
diff --git a/release-notes/8.0.0/4139.md b/release-notes/4139.md
similarity index 100%
rename from release-notes/8.0.0/4139.md
rename to release-notes/4139.md
diff --git a/release-notes/8.0.0/feat/4143.md b/release-notes/4143.md
similarity index 100%
rename from release-notes/8.0.0/feat/4143.md
rename to release-notes/4143.md
diff --git a/release-notes/4145.md b/release-notes/4145.md
new file mode 100644
index 000000000..2f6af7346
--- /dev/null
+++ b/release-notes/4145.md
@@ -0,0 +1,6 @@
+- feat(perf): [commit](https://codeberg.org/forgejo/forgejo/commit/358cd67c4f316f2d4f1d3be6dcb891dc04a2ff07) reduce memory usage for chunked artifact uploads to S3
+- feat: [commit](https://codeberg.org/forgejo/forgejo/commit/b60e3ac7b4aeeb9b8760f43eea9576c0e23309e9) allow downloading draft releases assets.
+- feat: [commit](https://codeberg.org/forgejo/forgejo/commit/1fca15529ac8fefb60d86b0c1f4bec8dae9a8566) API endpoints for managing tag protection
+- feat: [commit](https://codeberg.org/forgejo/forgejo/commit/4334c705b5f9388b16af23c7e75a69d027d07d5e) extract and display readme and comments for Composer packages
+- fix: [commit](https://codeberg.org/forgejo/forgejo/commit/364922c6e4f28264add9e2501a352c25ad6a0993) when a repository is adopted, its object format is not set in the database
+- fix: [commit](https://codeberg.org/forgejo/forgejo/commit/e7f332a55d6a48a3f3b4f2bfa43d18455ac00acc) during a migration from bitbucket, LFS downloads fail
diff --git a/release-notes/4160.md b/release-notes/4160.md
new file mode 100644
index 000000000..9a6bf6467
--- /dev/null
+++ b/release-notes/4160.md
@@ -0,0 +1 @@
+Added support for fuzzy searching issues and pulls - support for `/issues` and `/pulls` were ported from [`gitea#be5be0ac81`](https://github.com/go-gitea/gitea/commit/be5be0ac81ce50ad5adb079af6ca4e8c396aaece) - support for `/user/repo/issues` and `/user/repo/pulls` were added
diff --git a/release-notes/8.0.0/4189.md b/release-notes/4189.md
similarity index 100%
rename from release-notes/8.0.0/4189.md
rename to release-notes/4189.md
diff --git a/release-notes/8.0.0/4201.md b/release-notes/4201.md
similarity index 100%
rename from release-notes/8.0.0/4201.md
rename to release-notes/4201.md
diff --git a/release-notes/8.0.0/fix/4222.md b/release-notes/4222.md
similarity index 100%
rename from release-notes/8.0.0/fix/4222.md
rename to release-notes/4222.md
diff --git a/release-notes/8.0.0/fix/4240.md b/release-notes/4240.md
similarity index 100%
rename from release-notes/8.0.0/fix/4240.md
rename to release-notes/4240.md
diff --git a/release-notes/8.0.0/fix/4253.md b/release-notes/4253.md
similarity index 100%
rename from release-notes/8.0.0/fix/4253.md
rename to release-notes/4253.md
diff --git a/release-notes/8.0.0/feat/4262.md b/release-notes/4262.md
similarity index 100%
rename from release-notes/8.0.0/feat/4262.md
rename to release-notes/4262.md
diff --git a/release-notes/8.0.0/feat/31513.md b/release-notes/4266.md
similarity index 100%
rename from release-notes/8.0.0/feat/31513.md
rename to release-notes/4266.md
diff --git a/release-notes/9.0.0/feat/4291.md b/release-notes/4291.md
similarity index 100%
rename from release-notes/9.0.0/feat/4291.md
rename to release-notes/4291.md
diff --git a/release-notes/9.0.0/4367.md b/release-notes/4367.md
similarity index 100%
rename from release-notes/9.0.0/4367.md
rename to release-notes/4367.md
diff --git a/release-notes/9.0.0/fix/4427.md b/release-notes/4427.md
similarity index 100%
rename from release-notes/9.0.0/fix/4427.md
rename to release-notes/4427.md
diff --git a/release-notes/9.0.0/4439.md b/release-notes/4439.md
similarity index 100%
rename from release-notes/9.0.0/4439.md
rename to release-notes/4439.md
diff --git a/release-notes/8.0.0/feat/3729.md b/release-notes/8.0.0/feat/3729.md
deleted file mode 100644
index bc76e24bd..000000000
--- a/release-notes/8.0.0/feat/3729.md
+++ /dev/null
@@ -1 +0,0 @@
-- [PR](https://github.com/go-gitea/gitea/pull/30874): add actions-artifacts to the [storage migrate CLI](https://forgejo.org/docs/v8.0/admin/command-line/#migrate).
diff --git a/release-notes/8.0.0/feat/3922.md b/release-notes/8.0.0/feat/3922.md
deleted file mode 100644
index bd79f2adb..000000000
--- a/release-notes/8.0.0/feat/3922.md
+++ /dev/null
@@ -1,3 +0,0 @@
--   [`1e983e7`](https://github.com/alecthomas/chroma/commit/1e983e7) lexers/cue: support CUE attributes ([#​961](https://github.com/alecthomas/chroma/issues/961))
--   [`9347b55`](https://github.com/alecthomas/chroma/commit/9347b55) Add Gleam syntax highlighting ([#​959](https://github.com/alecthomas/chroma/issues/959))
--   [`2580aaa`](https://github.com/alecthomas/chroma/commit/2580aaa) Add Bazel bzlmod support into Python lexer ([#​947](https://github.com/alecthomas/chroma/issues/947))
diff --git a/release-notes/8.0.0/feat/3989.md b/release-notes/8.0.0/feat/3989.md
deleted file mode 100644
index 228c4e9bc..000000000
--- a/release-notes/8.0.0/feat/3989.md
+++ /dev/null
@@ -1,4 +0,0 @@
-- API endpoints that return a repository now [also include the topics](https://codeberg.org/forgejo/forgejo/commit/ee2247d77c0b13b0b45df704d7589b541db03899)
-- Display an error when an issue comment is [edited simultaneously by two users](https://codeberg.org/forgejo/forgejo/commit/ca0921a95aa9a37d8820538458c15fd0a3b0c97c) instead of silently overriding one of them
-- Add [support for a credentials chain for minio](https://codeberg.org/forgejo/forgejo/commit/73706ae26d138684ef9da9e1164846a040fd4a7d)
-- [Rename project board into column](https://codeberg.org/forgejo/forgejo/commit/a7591f9738dbefb2dcddeb2d45175abee3d03c1f) because it was confusing to users
diff --git a/release-notes/8.0.0/feat/4072.md b/release-notes/8.0.0/feat/4072.md
deleted file mode 100644
index 1f1483057..000000000
--- a/release-notes/8.0.0/feat/4072.md
+++ /dev/null
@@ -1,5 +0,0 @@
-- Added Enter key handling to the new Markdown editor ([#4072](https://codeberg.org/forgejo/forgejo/pulls/4072)):
-  - Pressing Enter while in a list, quote or code block will copy the prefix to the new line.
-  - Ordered list index will be increased for the new line, and task list "checkbox" will be unchecked.
-- Added indent/unindent function for a line or selection.
-  - Currently available as toolbar buttons ([#4263](https://codeberg.org/forgejo/forgejo/pulls/4263))
diff --git a/release-notes/8.0.0/feat/4145.md b/release-notes/8.0.0/feat/4145.md
deleted file mode 100644
index 872e5d468..000000000
--- a/release-notes/8.0.0/feat/4145.md
+++ /dev/null
@@ -1,3 +0,0 @@
-- [commit](https://codeberg.org/forgejo/forgejo/commit/b60e3ac7b4aeeb9b8760f43eea9576c0e23309e9) allow downloading draft releases assets.
-- [commit](https://codeberg.org/forgejo/forgejo/commit/1fca15529ac8fefb60d86b0c1f4bec8dae9a8566) API endpoints for managing tag protection
-- [commit](https://codeberg.org/forgejo/forgejo/commit/4334c705b5f9388b16af23c7e75a69d027d07d5e) extract and display readme and comments for Composer packages
diff --git a/release-notes/8.0.0/feat/4160.md b/release-notes/8.0.0/feat/4160.md
deleted file mode 100644
index c8b7bdf47..000000000
--- a/release-notes/8.0.0/feat/4160.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Added support for fuzzy searching issues and pulls
-- support for `/issues` and `/pulls` were ported from [`gitea#be5be0ac81`](https://github.com/go-gitea/gitea/commit/be5be0ac81ce50ad5adb079af6ca4e8c396aaece)
-- support for `/user/repo/issues` and `/user/repo/pulls` were added
diff --git a/release-notes/8.0.0/fix/3729.md b/release-notes/8.0.0/fix/3729.md
deleted file mode 100644
index 9123c4a08..000000000
--- a/release-notes/8.0.0/fix/3729.md
+++ /dev/null
@@ -1 +0,0 @@
-- [PR](https://github.com/go-gitea/gitea/pull/30715): pull request search shows closed pull requests in the open tab
diff --git a/release-notes/8.0.0/fix/3922.md b/release-notes/8.0.0/fix/3922.md
deleted file mode 100644
index e507cea4d..000000000
--- a/release-notes/8.0.0/fix/3922.md
+++ /dev/null
@@ -1,2 +0,0 @@
--   [`736c0ea`](https://github.com/alecthomas/chroma/commit/736c0ea) Typescript: Several fixes ([#​952](https://github.com/alecthomas/chroma/issues/952))
--   [`e5c25d0`](https://github.com/alecthomas/chroma/commit/e5c25d0) Org: Keep all newlines ([#​951](https://github.com/alecthomas/chroma/issues/951))
diff --git a/release-notes/8.0.0/fix/4145.md b/release-notes/8.0.0/fix/4145.md
deleted file mode 100644
index c993fcc51..000000000
--- a/release-notes/8.0.0/fix/4145.md
+++ /dev/null
@@ -1,2 +0,0 @@
-- [commit](https://codeberg.org/forgejo/forgejo/commit/364922c6e4f28264add9e2501a352c25ad6a0993) when a repository is adopted, its object format is not set in the database
-- [commit](https://codeberg.org/forgejo/forgejo/commit/e7f332a55d6a48a3f3b4f2bfa43d18455ac00acc) during a migration from bitbucket, LFS downloads fail
diff --git a/release-notes/8.0.0/perf/3989.md b/release-notes/8.0.0/perf/3989.md
deleted file mode 100644
index d3d77695e..000000000
--- a/release-notes/8.0.0/perf/3989.md
+++ /dev/null
@@ -1 +0,0 @@
-- improve performances when [retrieving pull requests via the API](https://codeberg.org/forgejo/forgejo/commit/47a2102694c47bc30a2a7c673c328471839ef206)
diff --git a/release-notes/8.0.0/perf/4145.md b/release-notes/8.0.0/perf/4145.md
deleted file mode 100644
index bb59fd1dc..000000000
--- a/release-notes/8.0.0/perf/4145.md
+++ /dev/null
@@ -1 +0,0 @@
-- [commit](https://codeberg.org/forgejo/forgejo/commit/358cd67c4f316f2d4f1d3be6dcb891dc04a2ff07) reduce memory usage for chunked artifact uploads to S3