diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a09b2dada04..39120196123 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -3,6 +3,24 @@
 :issue: https://github.com/elastic/beats/issues/
 :pull: https://github.com/elastic/beats/pull/
 
+[[release-notes-7.17.22]]
+=== Beats version 7.17.22
+https://github.com/elastic/beats/compare/v7.17.21\...v7.17.22[View commits]
+
+==== Bugfixes
+
+*Auditbeat*
+
+- Prevent scenario of losing children-related file events in a directory for recursive fsnotify backend of Auditbeat file integrity module. {pull}39133[39133]
+- Fix losing events in FIM for MacOS X by allowing always to walk an added directory to monitor. {pull}39362[39362]
+
+==== Added
+
+*Affecting all Beats*
+
+- Upgrade to Go 1.21.10. {pull}39468[39468]
+
+
 [[release-notes-7.17.21]]
 === Beats version 7.17.21
 https://github.com/elastic/beats/compare/v7.17.20\...v7.17.21[View commits]
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 3e09a9efc06..5cc785f66d5 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -35,8 +35,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 *Auditbeat*
 
 
-- Prevent scenario of losing children-related file events in a directory for recursive fsnotify backend of auditbeat file integrity module {pull}39133[39133]
-- Fix losing events in FIM for OS X by allowing always to walk an added directory to monitor {pull}39362[39362]
 
 
 *Filebeat*
@@ -64,7 +62,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 *Affecting all Beats*
 
-- Upgrade to Go 1.21.10. {pull}39468[39468]
 
 *Auditbeat*
 
@@ -130,6 +127,9 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 
 
+
+
+
 
 
 
diff --git a/libbeat/docs/release.asciidoc b/libbeat/docs/release.asciidoc
index 05a88bf045c..6961c787977 100644
--- a/libbeat/docs/release.asciidoc
+++ b/libbeat/docs/release.asciidoc
@@ -8,6 +8,7 @@ This section summarizes the changes in each release. Also read
 <<breaking-changes>> for more detail about changes that affect
 upgrade.
 
+* <<release-notes-7.17.22>>
 * <<release-notes-7.17.21>>
 * <<release-notes-7.17.20>>
 * <<release-notes-7.17.19>>