diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f6284c5db..3e8f57be35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,55 +2,57 @@
 
 **Topics**
 
-- <a href="#v8-6-10">v8\.6\.10</a>
+- <a href="#v8-6-11">v8\.6\.11</a>
     - <a href="#release-summary">Release Summary</a>
+- <a href="#v8-6-10">v8\.6\.10</a>
+    - <a href="#release-summary-1">Release Summary</a>
     - <a href="#security-fixes">Security Fixes</a>
 - <a href="#v8-6-9">v8\.6\.9</a>
-    - <a href="#release-summary-1">Release Summary</a>
+    - <a href="#release-summary-2">Release Summary</a>
     - <a href="#security-fixes-1">Security Fixes</a>
 - <a href="#v8-6-8">v8\.6\.8</a>
-    - <a href="#release-summary-2">Release Summary</a>
+    - <a href="#release-summary-3">Release Summary</a>
     - <a href="#bugfixes">Bugfixes</a>
 - <a href="#v8-6-7">v8\.6\.7</a>
-    - <a href="#release-summary-3">Release Summary</a>
+    - <a href="#release-summary-4">Release Summary</a>
     - <a href="#bugfixes-1">Bugfixes</a>
 - <a href="#v8-6-6">v8\.6\.6</a>
-    - <a href="#release-summary-4">Release Summary</a>
+    - <a href="#release-summary-5">Release Summary</a>
     - <a href="#minor-changes">Minor Changes</a>
     - <a href="#bugfixes-2">Bugfixes</a>
 - <a href="#v8-6-5">v8\.6\.5</a>
-    - <a href="#release-summary-5">Release Summary</a>
+    - <a href="#release-summary-6">Release Summary</a>
     - <a href="#bugfixes-3">Bugfixes</a>
 - <a href="#v8-6-4">v8\.6\.4</a>
-    - <a href="#release-summary-6">Release Summary</a>
+    - <a href="#release-summary-7">Release Summary</a>
     - <a href="#minor-changes-1">Minor Changes</a>
     - <a href="#bugfixes-4">Bugfixes</a>
 - <a href="#v8-6-3">v8\.6\.3</a>
-    - <a href="#release-summary-7">Release Summary</a>
+    - <a href="#release-summary-8">Release Summary</a>
     - <a href="#minor-changes-2">Minor Changes</a>
     - <a href="#bugfixes-5">Bugfixes</a>
 - <a href="#v8-6-2">v8\.6\.2</a>
-    - <a href="#release-summary-8">Release Summary</a>
+    - <a href="#release-summary-9">Release Summary</a>
     - <a href="#bugfixes-6">Bugfixes</a>
     - <a href="#known-issues">Known Issues</a>
 - <a href="#v8-6-1">v8\.6\.1</a>
-    - <a href="#release-summary-9">Release Summary</a>
+    - <a href="#release-summary-10">Release Summary</a>
     - <a href="#security-fixes-2">Security Fixes</a>
     - <a href="#bugfixes-7">Bugfixes</a>
 - <a href="#v8-6-0">v8\.6\.0</a>
-    - <a href="#release-summary-10">Release Summary</a>
+    - <a href="#release-summary-11">Release Summary</a>
     - <a href="#minor-changes-3">Minor Changes</a>
     - <a href="#deprecated-features">Deprecated Features</a>
     - <a href="#bugfixes-8">Bugfixes</a>
     - <a href="#new-modules">New Modules</a>
 - <a href="#v8-5-0">v8\.5\.0</a>
-    - <a href="#release-summary-11">Release Summary</a>
+    - <a href="#release-summary-12">Release Summary</a>
     - <a href="#minor-changes-4">Minor Changes</a>
     - <a href="#security-fixes-3">Security Fixes</a>
     - <a href="#bugfixes-9">Bugfixes</a>
     - <a href="#new-modules-1">New Modules</a>
 - <a href="#v8-4-0">v8\.4\.0</a>
-    - <a href="#release-summary-12">Release Summary</a>
+    - <a href="#release-summary-13">Release Summary</a>
     - <a href="#minor-changes-5">Minor Changes</a>
     - <a href="#bugfixes-10">Bugfixes</a>
     - <a href="#new-plugins">New Plugins</a>
@@ -58,13 +60,13 @@
         - <a href="#filter">Filter</a>
     - <a href="#new-modules-2">New Modules</a>
 - <a href="#v8-3-0">v8\.3\.0</a>
-    - <a href="#release-summary-13">Release Summary</a>
+    - <a href="#release-summary-14">Release Summary</a>
     - <a href="#minor-changes-6">Minor Changes</a>
     - <a href="#deprecated-features-1">Deprecated Features</a>
     - <a href="#bugfixes-11">Bugfixes</a>
     - <a href="#new-modules-3">New Modules</a>
 - <a href="#v8-2-0">v8\.2\.0</a>
-    - <a href="#release-summary-14">Release Summary</a>
+    - <a href="#release-summary-15">Release Summary</a>
     - <a href="#minor-changes-7">Minor Changes</a>
     - <a href="#bugfixes-12">Bugfixes</a>
     - <a href="#new-plugins-1">New Plugins</a>
@@ -73,7 +75,7 @@
         - <a href="#lookup">Lookup</a>
     - <a href="#new-modules-4">New Modules</a>
 - <a href="#v8-1-0">v8\.1\.0</a>
-    - <a href="#release-summary-15">Release Summary</a>
+    - <a href="#release-summary-16">Release Summary</a>
     - <a href="#minor-changes-8">Minor Changes</a>
     - <a href="#bugfixes-13">Bugfixes</a>
     - <a href="#new-plugins-2">New Plugins</a>
@@ -81,13 +83,13 @@
         - <a href="#test">Test</a>
     - <a href="#new-modules-5">New Modules</a>
 - <a href="#v8-0-2">v8\.0\.2</a>
-    - <a href="#release-summary-16">Release Summary</a>
+    - <a href="#release-summary-17">Release Summary</a>
     - <a href="#bugfixes-14">Bugfixes</a>
 - <a href="#v8-0-1">v8\.0\.1</a>
-    - <a href="#release-summary-17">Release Summary</a>
+    - <a href="#release-summary-18">Release Summary</a>
     - <a href="#bugfixes-15">Bugfixes</a>
 - <a href="#v8-0-0">v8\.0\.0</a>
-    - <a href="#release-summary-18">Release Summary</a>
+    - <a href="#release-summary-19">Release Summary</a>
     - <a href="#minor-changes-9">Minor Changes</a>
     - <a href="#breaking-changes--porting-guide">Breaking Changes / Porting Guide</a>
     - <a href="#deprecated-features-2">Deprecated Features</a>
@@ -99,10 +101,22 @@
     - <a href="#new-modules-6">New Modules</a>
 This changelog describes changes after version 7\.0\.0\.
 
+<a id="v8-6-11"></a>
+## v8\.6\.11
+
+<a id="release-summary"></a>
+### Release Summary
+
+Maintenance release\.
+
+This is the last 8\.x\.y release\. The 8\.x\.y release train is now effectively End of Life\.
+
+Thanks to everyone who contributed to the community\.general 8\.x\.y releases\!
+
 <a id="v8-6-10"></a>
 ## v8\.6\.10
 
-<a id="release-summary"></a>
+<a id="release-summary-1"></a>
 ### Release Summary
 
 Maintenance release with a security fix\.
@@ -115,7 +129,7 @@ Maintenance release with a security fix\.
 <a id="v8-6-9"></a>
 ## v8\.6\.9
 
-<a id="release-summary-1"></a>
+<a id="release-summary-2"></a>
 ### Release Summary
 
 Maintenance release with a security fix\.
@@ -128,7 +142,7 @@ Maintenance release with a security fix\.
 <a id="v8-6-8"></a>
 ## v8\.6\.8
 
-<a id="release-summary-2"></a>
+<a id="release-summary-3"></a>
 ### Release Summary
 
 Maintenance release for inclusion in Ansible 9\.13\.0\.
@@ -141,7 +155,7 @@ Maintenance release for inclusion in Ansible 9\.13\.0\.
 <a id="v8-6-7"></a>
 ## v8\.6\.7
 
-<a id="release-summary-3"></a>
+<a id="release-summary-4"></a>
 ### Release Summary
 
 Bugfix release\.
@@ -155,7 +169,7 @@ Bugfix release\.
 <a id="v8-6-6"></a>
 ## v8\.6\.6
 
-<a id="release-summary-4"></a>
+<a id="release-summary-5"></a>
 ### Release Summary
 
 Regular bugfix release\.
@@ -190,7 +204,7 @@ security fixes\.
 <a id="v8-6-5"></a>
 ## v8\.6\.5
 
-<a id="release-summary-5"></a>
+<a id="release-summary-6"></a>
 ### Release Summary
 
 Regular bugfix release\.
@@ -209,7 +223,7 @@ Regular bugfix release\.
 <a id="v8-6-4"></a>
 ## v8\.6\.4
 
-<a id="release-summary-6"></a>
+<a id="release-summary-7"></a>
 ### Release Summary
 
 Regular bugfix release\.
@@ -230,7 +244,7 @@ Regular bugfix release\.
 <a id="v8-6-3"></a>
 ## v8\.6\.3
 
-<a id="release-summary-7"></a>
+<a id="release-summary-8"></a>
 ### Release Summary
 
 Regular bugfix release\.
@@ -251,7 +265,7 @@ Regular bugfix release\.
 <a id="v8-6-2"></a>
 ## v8\.6\.2
 
-<a id="release-summary-8"></a>
+<a id="release-summary-9"></a>
 ### Release Summary
 
 Regular bugfix release\.
@@ -278,7 +292,7 @@ Regular bugfix release\.
 <a id="v8-6-1"></a>
 ## v8\.6\.1
 
-<a id="release-summary-9"></a>
+<a id="release-summary-10"></a>
 ### Release Summary
 
 Regular bugfix release\.
@@ -299,7 +313,7 @@ Regular bugfix release\.
 <a id="v8-6-0"></a>
 ## v8\.6\.0
 
-<a id="release-summary-10"></a>
+<a id="release-summary-11"></a>
 ### Release Summary
 
 Regular bugfix and features release\.
@@ -353,7 +367,7 @@ Regular bugfix and features release\.
 <a id="v8-5-0"></a>
 ## v8\.5\.0
 
-<a id="release-summary-11"></a>
+<a id="release-summary-12"></a>
 ### Release Summary
 
 Regular feature and bugfix release with security fixes\.
@@ -398,7 +412,7 @@ Regular feature and bugfix release with security fixes\.
 <a id="v8-4-0"></a>
 ## v8\.4\.0
 
-<a id="release-summary-12"></a>
+<a id="release-summary-13"></a>
 ### Release Summary
 
 Regular bugfix and feature release\.
@@ -454,7 +468,7 @@ Regular bugfix and feature release\.
 <a id="v8-3-0"></a>
 ## v8\.3\.0
 
-<a id="release-summary-13"></a>
+<a id="release-summary-14"></a>
 ### Release Summary
 
 Regular bugfix and feature release\.
@@ -501,7 +515,7 @@ Regular bugfix and feature release\.
 <a id="v8-2-0"></a>
 ## v8\.2\.0
 
-<a id="release-summary-14"></a>
+<a id="release-summary-15"></a>
 ### Release Summary
 
 Regular bugfix and feature release\.
@@ -562,7 +576,7 @@ Regular bugfix and feature release\.
 <a id="v8-1-0"></a>
 ## v8\.1\.0
 
-<a id="release-summary-15"></a>
+<a id="release-summary-16"></a>
 ### Release Summary
 
 Regular bugfix and feature release\.
@@ -645,7 +659,7 @@ Regular bugfix and feature release\.
 <a id="v8-0-2"></a>
 ## v8\.0\.2
 
-<a id="release-summary-16"></a>
+<a id="release-summary-17"></a>
 ### Release Summary
 
 Bugfix release for inclusion in Ansible 9\.0\.0rc1\.
@@ -659,7 +673,7 @@ Bugfix release for inclusion in Ansible 9\.0\.0rc1\.
 <a id="v8-0-1"></a>
 ## v8\.0\.1
 
-<a id="release-summary-17"></a>
+<a id="release-summary-18"></a>
 ### Release Summary
 
 Bugfix release for inclusion in Ansible 9\.0\.0b1\.
@@ -677,7 +691,7 @@ Bugfix release for inclusion in Ansible 9\.0\.0b1\.
 <a id="v8-0-0"></a>
 ## v8\.0\.0
 
-<a id="release-summary-18"></a>
+<a id="release-summary-19"></a>
 ### Release Summary
 
 This is release 8\.0\.0 of <code>community\.general</code>\, released on 2023\-11\-01\.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7a67843a6b..48f2be77f9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,18 @@ Community General Release Notes
 
 This changelog describes changes after version 7.0.0.
 
+v8.6.11
+=======
+
+Release Summary
+---------------
+
+Maintenance release.
+
+This is the last 8.x.y release. The 8.x.y release train is now effectively End of Life.
+
+Thanks to everyone who contributed to the community.general 8.x.y releases!
+
 v8.6.10
 =======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 63144e240d..5c024b6cc6 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1695,3 +1695,18 @@ releases:
       - 8.6.10.yml
       - 9621-keycloak_client-sanitize-saml-encryption-key.yml
     release_date: '2025-01-27'
+  8.6.11:
+    changes:
+      release_summary: 'Maintenance release.
+
+
+        This is the last 8.x.y release. The 8.x.y release train is now effectively
+        End of Life.
+
+
+        Thanks to everyone who contributed to the community.general 8.x.y releases!
+
+        '
+    fragments:
+      - 8.6.11.yml
+    release_date: '2025-06-15'
diff --git a/changelogs/fragments/8.6.11.yml b/changelogs/fragments/8.6.11.yml
deleted file mode 100644
index d6f2bd9168..0000000000
--- a/changelogs/fragments/8.6.11.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-release_summary: |
-  Maintenance release.
-
-  This is the last 8.x.y release. The 8.x.y release train is now effectively End of Life.
-
-  Thanks to everyone who contributed to the community.general 8.x.y releases!