diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77a2aa4417..afb31dcd9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.0.4] - 2024-03-07
+### Fixed
+- Sort global config and repository config the same way
+- Buttons from plugins in the code view will not be removed after fetching more sources
+- Required plugins can be uninstalled even when dependent plugins are still installed
+- Plugin condition mismatch description to show condition and display specialised error message
+- Internal server error for commits with SSH signatures
+
 ## [3.0.3] - 2024-02-08
 ### Fixed
 - Default value for idle timeout in configuration
@@ -1481,3 +1489,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [3.0.1]: https://scm-manager.org/download/3.0.1
 [3.0.2]: https://scm-manager.org/download/3.0.2
 [3.0.3]: https://scm-manager.org/download/3.0.3
+[3.0.4]: https://scm-manager.org/download/3.0.4
diff --git a/gradle/changelog/code_buttons.yaml b/gradle/changelog/code_buttons.yaml
deleted file mode 100644
index 1e6c881e19..0000000000
--- a/gradle/changelog/code_buttons.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Buttons from plugins in the code view will not be removed after fetching more sources
diff --git a/gradle/changelog/dependent_plugin_uninstallation.yaml b/gradle/changelog/dependent_plugin_uninstallation.yaml
deleted file mode 100644
index e8af43f1df..0000000000
--- a/gradle/changelog/dependent_plugin_uninstallation.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Required plugins can be uninstalled even when dependent plugins are still installed
diff --git a/gradle/changelog/error_with_ssh_signature.yaml b/gradle/changelog/error_with_ssh_signature.yaml
deleted file mode 100644
index e94dcefda5..0000000000
--- a/gradle/changelog/error_with_ssh_signature.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Internal server error for commits with SSH signatures
diff --git a/gradle/changelog/impove_sorting.yaml b/gradle/changelog/impove_sorting.yaml
deleted file mode 100644
index 9d4b25ca76..0000000000
--- a/gradle/changelog/impove_sorting.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Sort global config and repository config the same way
diff --git a/gradle/changelog/plugin_condition_mismatch_description.yaml b/gradle/changelog/plugin_condition_mismatch_description.yaml
deleted file mode 100644
index 38a754578b..0000000000
--- a/gradle/changelog/plugin_condition_mismatch_description.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Plugin condition mismatch description to show condition and display specialised error message