diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 05f89910..74ae99f7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,26 @@ Docker Community Collection Release Notes
 .. contents:: Topics
 
 
+v2.4.0
+======
+
+Release Summary
+---------------
+
+Regular feature and bugfix release.
+
+Minor Changes
+-------------
+
+- Prepare collection for inclusion in an Execution Environment by declaring its dependencies. The ``docker_stack*`` modules are not supported (https://github.com/ansible-collections/community.docker/pull/336).
+- current_container_facts - add detection for GitHub Actions (https://github.com/ansible-collections/community.docker/pull/336).
+- docker_container - support returning Docker container log output when using Docker's ``local`` logging driver, an optimized local logging driver introduced in Docker 18.09 (https://github.com/ansible-collections/community.docker/pull/337).
+
+Bugfixes
+--------
+
+- docker connection plugin - make sure that ``docker_extra_args`` is used for querying the Docker version. Also ensures that the Docker version is only queried when needed. This is currently the case if a remote user is specified (https://github.com/ansible-collections/community.docker/issues/325, https://github.com/ansible-collections/community.docker/pull/327).
+
 v2.3.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 9cf2bab0..6b8ca7f1 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -588,3 +588,24 @@ releases:
     - 311-docker-actual_user.yml
     - 312-docker-connection-reset.yml
     release_date: '2022-03-28'
+  2.4.0:
+    changes:
+      bugfixes:
+      - docker connection plugin - make sure that ``docker_extra_args`` is used for
+        querying the Docker version. Also ensures that the Docker version is only
+        queried when needed. This is currently the case if a remote user is specified
+        (https://github.com/ansible-collections/community.docker/issues/325, https://github.com/ansible-collections/community.docker/pull/327).
+      minor_changes:
+      - Prepare collection for inclusion in an Execution Environment by declaring
+        its dependencies. The ``docker_stack*`` modules are not supported (https://github.com/ansible-collections/community.docker/pull/336).
+      - current_container_facts - add detection for GitHub Actions (https://github.com/ansible-collections/community.docker/pull/336).
+      - docker_container - support returning Docker container log output when using
+        Docker's ``local`` logging driver, an optimized local logging driver introduced
+        in Docker 18.09 (https://github.com/ansible-collections/community.docker/pull/337).
+      release_summary: Regular feature and bugfix release.
+    fragments:
+    - 2.4.0.yml
+    - 327-connection-fix.yml
+    - 336-ee.yml
+    - 337-container-output-from-local-logging-driver.yml
+    release_date: '2022-04-25'
diff --git a/changelogs/fragments/2.4.0.yml b/changelogs/fragments/2.4.0.yml
deleted file mode 100644
index c1cd23f0..00000000
--- a/changelogs/fragments/2.4.0.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Regular feature and bugfix release.
diff --git a/changelogs/fragments/327-connection-fix.yml b/changelogs/fragments/327-connection-fix.yml
deleted file mode 100644
index 1611875e..00000000
--- a/changelogs/fragments/327-connection-fix.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-bugfixes:
-  - "docker connection plugin - make sure that ``docker_extra_args`` is used for querying the Docker version.
-     Also ensures that the Docker version is only queried when needed. This is currently the case if a remote user is specified
-     (https://github.com/ansible-collections/community.docker/issues/325, https://github.com/ansible-collections/community.docker/pull/327)."
diff --git a/changelogs/fragments/336-ee.yml b/changelogs/fragments/336-ee.yml
deleted file mode 100644
index 9f05681e..00000000
--- a/changelogs/fragments/336-ee.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-minor_changes:
-  - "Prepare collection for inclusion in an Execution Environment by declaring its dependencies. The ``docker_stack*`` modules are not supported (https://github.com/ansible-collections/community.docker/pull/336)."
-  - "current_container_facts - add detection for GitHub Actions (https://github.com/ansible-collections/community.docker/pull/336)."
diff --git a/changelogs/fragments/337-container-output-from-local-logging-driver.yml b/changelogs/fragments/337-container-output-from-local-logging-driver.yml
deleted file mode 100644
index 1757e165..00000000
--- a/changelogs/fragments/337-container-output-from-local-logging-driver.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-  - "docker_container - support returning Docker container log output when using Docker's ``local`` logging driver, an optimized local logging driver introduced in Docker 18.09 (https://github.com/ansible-collections/community.docker/pull/337)."