diff --git a/docs/release-notes/8.14.asciidoc b/docs/release-notes/8.14.asciidoc
index ec08572ff6..96644dd6ae 100644
--- a/docs/release-notes/8.14.asciidoc
+++ b/docs/release-notes/8.14.asciidoc
@@ -26,6 +26,22 @@ On September 5, 2024, this issue was resolved.
 ====
 // end::known-issue-14686[]
 
+// tag::known-issue-192084[]
+[discrete]
+.Alerts wrongfully inherit previously-selected tags
+[%collapsible]
+====
+*Details* +
+
+When you add tags to alerts from the Alerts table, the previously-selected tags are incorrectly applied in addition to the new ones that you select.
+
+*Workaround* +
+
+When adding tags to an alert, click the previously-applied tags to re-apply them, then click them again to remove them. Save your changes by clicking *Apply tags*. This removes the old tags from the alert.
+
+====
+// end::known-issue-192084[]
+
 [discrete]
 [[bug-fixes-8.14.3]]
 ==== Bug fixes
@@ -57,6 +73,22 @@ On September 5, 2024, this issue was resolved.
 ====
 // end::known-issue-14686[]
 
+// tag::known-issue-192084[]
+[discrete]
+.Alerts wrongfully inherit previously-selected tags
+[%collapsible]
+====
+*Details* +
+
+When you add tags to alerts from the Alerts table, the previously-selected tags are incorrectly applied in addition to the new ones that you select.
+
+*Workaround* +
+
+When adding tags to an alert, click the previously-applied tags to re-apply them, then click them again to remove them. Save your changes by clicking *Apply tags*. This removes the old tags from the alert.
+
+====
+// end::known-issue-192084[]
+
 [discrete]
 [[bug-fixes-8.14.2]]
 ==== Bug fixes
@@ -88,6 +120,22 @@ On September 5, 2024, this issue was resolved.
 ====
 // end::known-issue-14686[]
 
+// tag::known-issue-192084[]
+[discrete]
+.Alerts wrongfully inherit previously-selected tags
+[%collapsible]
+====
+*Details* +
+
+When you add tags to alerts from the Alerts table, the previously-selected tags are incorrectly applied in addition to the new ones that you select.
+
+*Workaround* +
+
+When adding tags to an alert, click the previously-applied tags to re-apply them, then click them again to remove them. Save your changes by clicking *Apply tags*. This removes the old tags from the alert.
+
+====
+// end::known-issue-192084[]
+
 [discrete]
 [[bug-fixes-8.14.1]]
 ==== Bug fixes
@@ -123,6 +171,22 @@ On September 5, 2024, this issue was resolved.
 ====
 // end::known-issue-14686[]
 
+// tag::known-issue-192084[]
+[discrete]
+.Alerts wrongfully inherit previously-selected tags
+[%collapsible]
+====
+*Details* +
+
+When you add tags to alerts from the Alerts table, the previously-selected tags are incorrectly applied in addition to the new ones that you select.
+
+*Workaround* +
+
+When adding tags to an alert, click the previously-applied tags to re-apply them, then click them again to remove them. Save your changes by clicking *Apply tags*. This removes the old tags from the alert.
+
+====
+// end::known-issue-192084[]
+
 [discrete]
 [[features-8.14.0]]
 ==== New features
diff --git a/docs/release-notes/8.15.asciidoc b/docs/release-notes/8.15.asciidoc
index 343c5f758f..a6a91fc4b6 100644
--- a/docs/release-notes/8.15.asciidoc
+++ b/docs/release-notes/8.15.asciidoc
@@ -2,6 +2,70 @@
 == 8.15
 
 [discrete]
+<<<<<<< HEAD
+=======
+[[release-notes-8.15.2]]
+=== 8.15.2
+
+[discrete]
+[[known-issue-8.15.2]]
+==== Known issues
+
+// tag::known-issue-189676[]
+[discrete]
+.Tags appear in Elastic AI Assistant's responses
+[%collapsible]
+====
+*Details* +
+On August 1, 2024, it was discovered that Elastic AI Assistant's responses when using Bedrock Sonnet 3.5 may include `<antThinking>` tags, for example `<search_quality_reflection>` ({kibana-issue}189676[#189676]).
+
+====
+// end::known-issue-189676[]
+
+// tag::known-issue-192084[]
+[discrete]
+.Alerts wrongfully inherit previously-selected tags
+[%collapsible]
+====
+*Details* +
+
+When you add tags to alerts from the Alerts table, the previously-selected tags are incorrectly applied in addition to the new ones that you select.
+
+*Workaround* +
+
+When adding tags to an alert, click the previously-applied tags to re-apply them, then click them again to remove them. Save your changes by clicking *Apply tags*. This removes the old tags from the alert.
+
+====
+// end::known-issue-192084[]
+
+[discrete]
+[[features-8.15.2]]
+==== New features
+* Allows Automatic Import to use sample input logs to identify log format types ({kibana-pull}190407[#190407]).
+* Allows Automatic Import to use system logs with structured message bodies ({kibana-pull}191749[#191749]).
+
+[discrete]
+[[enhancements-8.15.2]]
+==== Enhancements
+* Adds Ubuntu 24.04 support for {elastic-defend}.
+* Improves {elastic-defend}'s support of call stack module stomp detection in Windows 11 24H2 ({kibana-pull}192490[#192490]).
+* Allows you to use the Google Gemini, OpenAI, and Azure OpenAI connectors with Automatic Import ({kibana-pull}191577[#191577]).
+* Allows Automatic Import to use unstructured system logs ({kibana-pull}192817[#192817]).
+* Displays error messages in Automatic Import when logs sample files don't successfully upload ({kibana-pull}191310[#191310]).
+* Ensures that Automatic Import performs reproducible sampling from a list of log entries instead of truncating them ({kibana-pull}191598[#191598]).
+
+[discrete]
+[[bug-fixes-8.15.2]]
+==== Bug fixes
+* Prevents the Google Gemini connector from accepting unknown properties in responses, which resolves an error that occurred when generating Attack discoveries ({kibana-pull}192915[#192915]).
+* Fixes the **View in AI Assistant** button in Attack discovery, which previously did not work ({kibana-pull}192416[#192416]).
+* Changes the owner of integrations created by Automatic Import from `Elastic` to `Community` ({kibana-pull}193002[#193002]).
+* Fixes issues with rendering the package manifest in Automatic Import ({kibana-pull}192316[#192316]).
+* Fixes an issue that prevented the `http_endpoint` input configuration from loading correctly in the Automatic Import workflow ({kibana-pull}191964[#191964]).
+* Fixes a bug that prevented the `enable` field from being respected when you import rules ({kibana-pull}192302[#192302]).
+
+[discrete]
+>>>>>>> bceccfbb ([Known Issue][Detection Engine] Alert tags maintain state (#5884))
 [[release-notes-8.15.1]]
 === 8.15.1
 
@@ -21,6 +85,22 @@ On August 1, 2024, it was discovered that Elastic AI Assistant's responses when
 ====
 // end::known-issue-189676[]
 
+// tag::known-issue-192084[]
+[discrete]
+.Alerts wrongfully inherit previously-selected tags
+[%collapsible]
+====
+*Details* +
+
+When you add tags to alerts from the Alerts table, the previously-selected tags are incorrectly applied in addition to the new ones that you select.
+
+*Workaround* +
+
+When adding tags to an alert, click the previously-applied tags to re-apply them, then click them again to remove them. Save your changes by clicking *Apply tags*. This removes the old tags from the alert.
+
+====
+// end::known-issue-192084[]
+
 [discrete]
 [[features-8.15.1]]
 ==== New features
@@ -108,6 +188,22 @@ On September 5, 2024, this issue was resolved.
 ====
 // end::known-issue-14686[]
 
+// tag::known-issue-192084[]
+[discrete]
+.Alerts wrongfully inherit previously-selected tags
+[%collapsible]
+====
+*Details* +
+
+When you add tags to alerts from the Alerts table, the previously-selected tags are incorrectly applied in addition to the new ones that you select.
+
+*Workaround* +
+
+When adding tags to an alert, click the previously-applied tags to re-apply them, then click them again to remove them. Save your changes by clicking *Apply tags*. This removes the old tags from the alert.
+
+====
+// end::known-issue-192084[]
+
 [discrete]
 [[breaking-changes-8.15.0]]
 ==== Breaking changes