diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 201042ea5a..4a4cf61147 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,81 @@ Community General Release Notes
 
 This changelog describes changes after version 2.0.0.
 
+v3.8.0
+======
+
+Release Summary
+---------------
+
+Regular feature and bugfix release. Please note that this is the last minor 3.x.0 release; afterwards there will only be bugfix releases 3.8.y.
+
+Minor Changes
+-------------
+
+- mail - added the ``ehlohost`` parameter which allows for manual override of the host used in SMTP EHLO (https://github.com/ansible-collections/community.general/pull/3425).
+- nmcli - the option ``routing_rules4`` can now be specified as a list of strings, instead of as a single string (https://github.com/ansible-collections/community.general/issues/3401).
+- open-iscsi - adding support for mutual authentication between target and initiator (https://github.com/ansible-collections/community.general/pull/3422).
+- opentelemetry callback plugin - added option ``enable_from_environment`` to support enabling the plugin only if the given environment variable exists and it is set to true (https://github.com/ansible-collections/community.general/pull/3498).
+- opentelemetry callback plugin - enriched the stacktrace information with the ``message``, ``exception`` and ``stderr`` fields from the failed task (https://github.com/ansible-collections/community.general/pull/3496).
+- pkgng - packages being installed (or upgraded) are acted on in one command (per action) (https://github.com/ansible-collections/community.general/issues/2265).
+- pkgng - status message specifies number of packages installed and/or upgraded separately. Previously, all changes were reported as one count of packages "added" (https://github.com/ansible-collections/community.general/pull/3393).
+- terraform - add ``parallelism`` parameter (https://github.com/ansible-collections/community.general/pull/3540).
+- ufw - if ``delete=true`` and ``insert`` option is present, then ``insert`` is now ignored rather than failing with a syntax error (https://github.com/ansible-collections/community.general/pull/3514).
+
+Bugfixes
+--------
+
+- gitlab_deploy_key - fix idempotency on projects with multiple deploy keys (https://github.com/ansible-collections/community.general/pull/3473).
+- gitlab_group - avoid passing wrong value for ``require_two_factor_authentication`` on creation when the option has not been specified (https://github.com/ansible-collections/community.general/pull/3453).
+- gitlab_group_members - ``get_group_id`` return the group ID by matching ``full_path``, ``path`` or ``name`` (https://github.com/ansible-collections/community.general/pull/3400).
+- jboss - fix the deployment file permission issue when Jboss server is running under non-root user. The deployment file is copied with file content only. The file permission is set to ``440`` and belongs to root user. When the JBoss ``WildFly`` server is running under non-root user, it is unable to read the deployment file (https://github.com/ansible-collections/community.general/pull/3426).
+- keycloak_authentication - fix bug, the requirement was always on ``DISABLED`` when creating a new authentication flow (https://github.com/ansible-collections/community.general/pull/3330).
+- keycloak_identity_provider - fix change detection when updating identity provider mappers (https://github.com/ansible-collections/community.general/pull/3538, https://github.com/ansible-collections/community.general/issues/3537).
+- keycloak_role - quote role name when used in URL path to avoid errors when role names contain special characters (https://github.com/ansible-collections/community.general/issues/3535, https://github.com/ansible-collections/community.general/pull/3536).
+- logstash callback plugin - replace ``_option`` with ``context.CLIARGS`` to fix the plugin on ansible-base and ansible-core (https://github.com/ansible-collections/community.general/issues/2692).
+- macports - add ``stdout`` and ``stderr`` to return values (https://github.com/ansible-collections/community.general/issues/3499).
+- opentelemetry callback plugin - validated the task result exception without crashing. Also simplifying code a bit (https://github.com/ansible-collections/community.general/pull/3450, https://github.com/ansible/ansible/issues/75726).
+- yaml callback plugin - avoid modifying PyYAML so that other plugins using it on the controller, like the ``to_yaml`` filter, do not produce different output (https://github.com/ansible-collections/community.general/issues/3471, https://github.com/ansible-collections/community.general/pull/3478).
+- zypper_repository - when an URL to a .repo file was provided in option ``repo=`` and ``state=present`` only the first run was successful, future runs failed due to missing checks prior starting zypper. Usage of ``state=absent`` in combination with a .repo file was not working either (https://github.com/ansible-collections/community.general/issues/1791, https://github.com/ansible-collections/community.general/issues/3466).
+
+New Plugins
+-----------
+
+Callback
+~~~~~~~~
+
+- elastic - Create distributed traces for each Ansible task in Elastic APM
+
+Inventory
+~~~~~~~~~
+
+- opennebula - OpenNebula inventory source
+
+New Modules
+-----------
+
+Cloud
+~~~~~
+
+misc
+^^^^
+
+- proxmox_tasks_info - Retrieve information about one or more Proxmox VE tasks
+
+Packaging
+~~~~~~~~~
+
+language
+^^^^^^^^
+
+- pipx - Manages applications installed with pipx
+
+Web Infrastructure
+~~~~~~~~~~~~~~~~~~
+
+- rundeck_job_executions_info - Query executions for a Rundeck job
+- rundeck_job_run - Run a Rundeck job
+
 v3.7.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 8560799bd7..0e8e80bf82 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1835,3 +1835,108 @@ releases:
         name: icinga2
         namespace: null
     release_date: '2021-09-21'
+  3.8.0:
+    changes:
+      bugfixes:
+      - gitlab_deploy_key - fix idempotency on projects with multiple deploy keys
+        (https://github.com/ansible-collections/community.general/pull/3473).
+      - gitlab_group - avoid passing wrong value for ``require_two_factor_authentication``
+        on creation when the option has not been specified (https://github.com/ansible-collections/community.general/pull/3453).
+      - gitlab_group_members - ``get_group_id`` return the group ID by matching ``full_path``,
+        ``path`` or ``name`` (https://github.com/ansible-collections/community.general/pull/3400).
+      - jboss - fix the deployment file permission issue when Jboss server is running
+        under non-root user. The deployment file is copied with file content only.
+        The file permission is set to ``440`` and belongs to root user. When the JBoss
+        ``WildFly`` server is running under non-root user, it is unable to read the
+        deployment file (https://github.com/ansible-collections/community.general/pull/3426).
+      - keycloak_authentication - fix bug, the requirement was always on ``DISABLED``
+        when creating a new authentication flow (https://github.com/ansible-collections/community.general/pull/3330).
+      - keycloak_identity_provider - fix change detection when updating identity provider
+        mappers (https://github.com/ansible-collections/community.general/pull/3538,
+        https://github.com/ansible-collections/community.general/issues/3537).
+      - keycloak_role - quote role name when used in URL path to avoid errors when
+        role names contain special characters (https://github.com/ansible-collections/community.general/issues/3535,
+        https://github.com/ansible-collections/community.general/pull/3536).
+      - logstash callback plugin - replace ``_option`` with ``context.CLIARGS`` to
+        fix the plugin on ansible-base and ansible-core (https://github.com/ansible-collections/community.general/issues/2692).
+      - macports - add ``stdout`` and ``stderr`` to return values (https://github.com/ansible-collections/community.general/issues/3499).
+      - opentelemetry callback plugin - validated the task result exception without
+        crashing. Also simplifying code a bit (https://github.com/ansible-collections/community.general/pull/3450,
+        https://github.com/ansible/ansible/issues/75726).
+      - yaml callback plugin - avoid modifying PyYAML so that other plugins using
+        it on the controller, like the ``to_yaml`` filter, do not produce different
+        output (https://github.com/ansible-collections/community.general/issues/3471,
+        https://github.com/ansible-collections/community.general/pull/3478).
+      - zypper_repository - when an URL to a .repo file was provided in option ``repo=``
+        and ``state=present`` only the first run was successful, future runs failed
+        due to missing checks prior starting zypper. Usage of ``state=absent`` in
+        combination with a .repo file was not working either (https://github.com/ansible-collections/community.general/issues/1791,
+        https://github.com/ansible-collections/community.general/issues/3466).
+      minor_changes:
+      - mail - added the ``ehlohost`` parameter which allows for manual override of
+        the host used in SMTP EHLO (https://github.com/ansible-collections/community.general/pull/3425).
+      - nmcli - the option ``routing_rules4`` can now be specified as a list of strings,
+        instead of as a single string (https://github.com/ansible-collections/community.general/issues/3401).
+      - open-iscsi - adding support for mutual authentication between target and initiator
+        (https://github.com/ansible-collections/community.general/pull/3422).
+      - opentelemetry callback plugin - added option ``enable_from_environment`` to
+        support enabling the plugin only if the given environment variable exists
+        and it is set to true (https://github.com/ansible-collections/community.general/pull/3498).
+      - opentelemetry callback plugin - enriched the stacktrace information with the
+        ``message``, ``exception`` and ``stderr`` fields from the failed task (https://github.com/ansible-collections/community.general/pull/3496).
+      - pkgng - packages being installed (or upgraded) are acted on in one command
+        (per action) (https://github.com/ansible-collections/community.general/issues/2265).
+      - pkgng - status message specifies number of packages installed and/or upgraded
+        separately. Previously, all changes were reported as one count of packages
+        "added" (https://github.com/ansible-collections/community.general/pull/3393).
+      - terraform - add ``parallelism`` parameter (https://github.com/ansible-collections/community.general/pull/3540).
+      - ufw - if ``delete=true`` and ``insert`` option is present, then ``insert``
+        is now ignored rather than failing with a syntax error (https://github.com/ansible-collections/community.general/pull/3514).
+      release_summary: Regular feature and bugfix release. Please note that this is
+        the last minor 3.x.0 release; afterwards there will only be bugfix releases
+        3.8.y.
+    fragments:
+    - 2692-logstash-callback-plugin-replacing_options.yml
+    - 3.8.0.yml
+    - 3330-bugfix-keycloak-authentication-flow-requirements-not-set-correctly.yml.yml
+    - 3393-pkgng-many_packages_one_command.yml
+    - 3400-fix-gitLab-api-searches-always-return-first-found-match-3386.yml
+    - 3401-nmcli-needs-type.yml
+    - 3422-open-iscsi-mutual-authentication-support.yaml
+    - 3425-mail_add_configurable_ehlo_hostname.yml
+    - 3426-copy-permissions-along-with-file-for-jboss-module.yml
+    - 3450-callback_opentelemetry-exception_handling.yml
+    - 3453-fix-gitlab_group-require_two_factor_authentication-cant_be_null.yml
+    - 3473-gitlab_deploy_key-fix_idempotency.yml
+    - 3474-zypper_repository_improve_repo_file_idempotency.yml
+    - 3478-yaml-callback.yml
+    - 3496-callback_opentelemetry-enrich_stacktraces.yml
+    - 3498-callback_opentelemetry-only_in_ci.yml
+    - 3500-macports-add-stdout-and-stderr-to-status.yaml
+    - 3514-ufw_insert_or_delete_biased_when_deletion_enabled.yml
+    - 3536-quote-role-name-in-url.yml
+    - 3538-fix-keycloak-idp-mappers-change-detection.yml
+    - 3540-terraform_add_parallelism_parameter.yml
+    modules:
+    - description: Manages applications installed with pipx
+      name: pipx
+      namespace: packaging.language
+    - description: Retrieve information about one or more Proxmox VE tasks
+      name: proxmox_tasks_info
+      namespace: cloud.misc
+    - description: Query executions for a Rundeck job
+      name: rundeck_job_executions_info
+      namespace: web_infrastructure
+    - description: Run a Rundeck job
+      name: rundeck_job_run
+      namespace: web_infrastructure
+    plugins:
+      callback:
+      - description: Create distributed traces for each Ansible task in Elastic APM
+        name: elastic
+        namespace: null
+      inventory:
+      - description: OpenNebula inventory source
+        name: opennebula
+        namespace: null
+    release_date: '2021-10-12'
diff --git a/changelogs/fragments/2692-logstash-callback-plugin-replacing_options.yml b/changelogs/fragments/2692-logstash-callback-plugin-replacing_options.yml
deleted file mode 100644
index ccf803598a..0000000000
--- a/changelogs/fragments/2692-logstash-callback-plugin-replacing_options.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-bugfixes:
-  - 'logstash callback plugin - replace ``_option`` with ``context.CLIARGS`` to fix the plugin on ansible-base and ansible-core (https://github.com/ansible-collections/community.general/issues/2692).'
diff --git a/changelogs/fragments/3.8.0.yml b/changelogs/fragments/3.8.0.yml
deleted file mode 100644
index a92fd7c5eb..0000000000
--- a/changelogs/fragments/3.8.0.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Regular feature and bugfix release. Please note that this is the last minor 3.x.0 release; afterwards there will only be bugfix releases 3.8.y.
diff --git a/changelogs/fragments/3330-bugfix-keycloak-authentication-flow-requirements-not-set-correctly.yml.yml b/changelogs/fragments/3330-bugfix-keycloak-authentication-flow-requirements-not-set-correctly.yml.yml
deleted file mode 100644
index bcd2e594d7..0000000000
--- a/changelogs/fragments/3330-bugfix-keycloak-authentication-flow-requirements-not-set-correctly.yml.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-bugfixes:
-  - keycloak_authentication - fix bug, the requirement was always on ``DISABLED`` when creating a new authentication flow
-    (https://github.com/ansible-collections/community.general/pull/3330).
diff --git a/changelogs/fragments/3393-pkgng-many_packages_one_command.yml b/changelogs/fragments/3393-pkgng-many_packages_one_command.yml
deleted file mode 100644
index 49b24f0bfc..0000000000
--- a/changelogs/fragments/3393-pkgng-many_packages_one_command.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-minor_changes:
-  - pkgng - packages being installed (or upgraded) are acted on in one command (per action)
-    (https://github.com/ansible-collections/community.general/issues/2265).
-  - pkgng - status message specifies number of packages installed and/or upgraded separately.
-    Previously, all changes were reported as one count of packages "added" (https://github.com/ansible-collections/community.general/pull/3393).
diff --git a/changelogs/fragments/3400-fix-gitLab-api-searches-always-return-first-found-match-3386.yml b/changelogs/fragments/3400-fix-gitLab-api-searches-always-return-first-found-match-3386.yml
deleted file mode 100644
index ab13b4adba..0000000000
--- a/changelogs/fragments/3400-fix-gitLab-api-searches-always-return-first-found-match-3386.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - gitlab_group_members - ``get_group_id`` return the group ID by matching ``full_path``, ``path`` or ``name`` (https://github.com/ansible-collections/community.general/pull/3400).
diff --git a/changelogs/fragments/3401-nmcli-needs-type.yml b/changelogs/fragments/3401-nmcli-needs-type.yml
deleted file mode 100644
index 9fe7593ba3..0000000000
--- a/changelogs/fragments/3401-nmcli-needs-type.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-minor_changes:
-  - "nmcli - the option ``routing_rules4`` can now be specified as a list of strings, instead of as a single string (https://github.com/ansible-collections/community.general/issues/3401)."
diff --git a/changelogs/fragments/3422-open-iscsi-mutual-authentication-support.yaml b/changelogs/fragments/3422-open-iscsi-mutual-authentication-support.yaml
deleted file mode 100644
index c5fc84d1ae..0000000000
--- a/changelogs/fragments/3422-open-iscsi-mutual-authentication-support.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-minor_changes:
-  - open-iscsi - adding support for mutual authentication between target and initiator (https://github.com/ansible-collections/community.general/pull/3422).
diff --git a/changelogs/fragments/3425-mail_add_configurable_ehlo_hostname.yml b/changelogs/fragments/3425-mail_add_configurable_ehlo_hostname.yml
deleted file mode 100644
index dbc9cfb276..0000000000
--- a/changelogs/fragments/3425-mail_add_configurable_ehlo_hostname.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-  - mail - added the ``ehlohost`` parameter which allows for manual override of the host used in SMTP EHLO (https://github.com/ansible-collections/community.general/pull/3425).
diff --git a/changelogs/fragments/3426-copy-permissions-along-with-file-for-jboss-module.yml b/changelogs/fragments/3426-copy-permissions-along-with-file-for-jboss-module.yml
deleted file mode 100644
index 7685cce02b..0000000000
--- a/changelogs/fragments/3426-copy-permissions-along-with-file-for-jboss-module.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-bugfixes:
-  - jboss - fix the deployment file permission issue when Jboss server is running 
-    under non-root user. The deployment file is copied with file content only. The 
-    file permission is set to ``440`` and belongs to root user. When the
-    JBoss ``WildFly`` server is running under non-root user, it is unable to read
-    the deployment file (https://github.com/ansible-collections/community.general/pull/3426).
diff --git a/changelogs/fragments/3450-callback_opentelemetry-exception_handling.yml b/changelogs/fragments/3450-callback_opentelemetry-exception_handling.yml
deleted file mode 100644
index 09e0af8bee..0000000000
--- a/changelogs/fragments/3450-callback_opentelemetry-exception_handling.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - opentelemetry callback plugin - validated the task result exception without crashing. Also simplifying code a bit (https://github.com/ansible-collections/community.general/pull/3450, https://github.com/ansible/ansible/issues/75726).
diff --git a/changelogs/fragments/3453-fix-gitlab_group-require_two_factor_authentication-cant_be_null.yml b/changelogs/fragments/3453-fix-gitlab_group-require_two_factor_authentication-cant_be_null.yml
deleted file mode 100644
index 3077b4a45d..0000000000
--- a/changelogs/fragments/3453-fix-gitlab_group-require_two_factor_authentication-cant_be_null.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - gitlab_group - avoid passing wrong value for ``require_two_factor_authentication`` on creation when the option has not been specified (https://github.com/ansible-collections/community.general/pull/3453).
diff --git a/changelogs/fragments/3473-gitlab_deploy_key-fix_idempotency.yml b/changelogs/fragments/3473-gitlab_deploy_key-fix_idempotency.yml
deleted file mode 100644
index 45dc8f9641..0000000000
--- a/changelogs/fragments/3473-gitlab_deploy_key-fix_idempotency.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - gitlab_deploy_key - fix idempotency on projects with multiple deploy keys (https://github.com/ansible-collections/community.general/pull/3473).
diff --git a/changelogs/fragments/3474-zypper_repository_improve_repo_file_idempotency.yml b/changelogs/fragments/3474-zypper_repository_improve_repo_file_idempotency.yml
deleted file mode 100644
index 4f3b56329c..0000000000
--- a/changelogs/fragments/3474-zypper_repository_improve_repo_file_idempotency.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-bugfixes:
-  - zypper_repository - when an URL to a .repo file was provided in option 
-    ``repo=`` and ``state=present`` only the first run was successful, 
-    future runs failed due to missing checks prior starting zypper.
-    Usage of ``state=absent`` in combination with a .repo file was not 
-    working either (https://github.com/ansible-collections/community.general/issues/1791,
-    https://github.com/ansible-collections/community.general/issues/3466).
diff --git a/changelogs/fragments/3478-yaml-callback.yml b/changelogs/fragments/3478-yaml-callback.yml
deleted file mode 100644
index ec1801beaa..0000000000
--- a/changelogs/fragments/3478-yaml-callback.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "yaml callback plugin - avoid modifying PyYAML so that other plugins using it on the controller, like the ``to_yaml`` filter, do not produce different output (https://github.com/ansible-collections/community.general/issues/3471, https://github.com/ansible-collections/community.general/pull/3478)."
diff --git a/changelogs/fragments/3496-callback_opentelemetry-enrich_stacktraces.yml b/changelogs/fragments/3496-callback_opentelemetry-enrich_stacktraces.yml
deleted file mode 100644
index d273083b08..0000000000
--- a/changelogs/fragments/3496-callback_opentelemetry-enrich_stacktraces.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-  - opentelemetry callback plugin - enriched the stacktrace information with the ``message``, ``exception`` and ``stderr`` fields from the failed task (https://github.com/ansible-collections/community.general/pull/3496).
diff --git a/changelogs/fragments/3498-callback_opentelemetry-only_in_ci.yml b/changelogs/fragments/3498-callback_opentelemetry-only_in_ci.yml
deleted file mode 100644
index 7187ba3770..0000000000
--- a/changelogs/fragments/3498-callback_opentelemetry-only_in_ci.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-  - opentelemetry callback plugin - added option ``enable_from_environment`` to support enabling the plugin only if the given environment variable exists and it is set to true (https://github.com/ansible-collections/community.general/pull/3498).
diff --git a/changelogs/fragments/3500-macports-add-stdout-and-stderr-to-status.yaml b/changelogs/fragments/3500-macports-add-stdout-and-stderr-to-status.yaml
deleted file mode 100644
index f39466d876..0000000000
--- a/changelogs/fragments/3500-macports-add-stdout-and-stderr-to-status.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-bugfixes:
-  - macports - add ``stdout`` and ``stderr`` to return values
-    (https://github.com/ansible-collections/community.general/issues/3499).
diff --git a/changelogs/fragments/3514-ufw_insert_or_delete_biased_when_deletion_enabled.yml b/changelogs/fragments/3514-ufw_insert_or_delete_biased_when_deletion_enabled.yml
deleted file mode 100644
index 93c1bf96d5..0000000000
--- a/changelogs/fragments/3514-ufw_insert_or_delete_biased_when_deletion_enabled.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-  - "ufw - if ``delete=true`` and ``insert`` option is present, then ``insert`` is now ignored rather than failing with a syntax error (https://github.com/ansible-collections/community.general/pull/3514)."
diff --git a/changelogs/fragments/3536-quote-role-name-in-url.yml b/changelogs/fragments/3536-quote-role-name-in-url.yml
deleted file mode 100644
index e7acae3247..0000000000
--- a/changelogs/fragments/3536-quote-role-name-in-url.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - keycloak_role - quote role name when used in URL path to avoid errors when role names contain special characters (https://github.com/ansible-collections/community.general/issues/3535, https://github.com/ansible-collections/community.general/pull/3536).
diff --git a/changelogs/fragments/3538-fix-keycloak-idp-mappers-change-detection.yml b/changelogs/fragments/3538-fix-keycloak-idp-mappers-change-detection.yml
deleted file mode 100644
index bd205ceb2a..0000000000
--- a/changelogs/fragments/3538-fix-keycloak-idp-mappers-change-detection.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - keycloak_identity_provider - fix change detection when updating identity provider mappers (https://github.com/ansible-collections/community.general/pull/3538, https://github.com/ansible-collections/community.general/issues/3537).
diff --git a/changelogs/fragments/3540-terraform_add_parallelism_parameter.yml b/changelogs/fragments/3540-terraform_add_parallelism_parameter.yml
deleted file mode 100644
index 45b1b0d0f4..0000000000
--- a/changelogs/fragments/3540-terraform_add_parallelism_parameter.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-minor_changes:
-  - terraform - add ``parallelism`` parameter (https://github.com/ansible-collections/community.general/pull/3540).