diff --git a/changelog/8.6.1.yaml b/changelog/8.6.1.yaml
new file mode 100644
index 00000000000..792ccc6177c
--- /dev/null
+++ b/changelog/8.6.1.yaml
@@ -0,0 +1,62 @@
+version: 8.6.1
+entries:
+    - kind: bug-fix
+      summary: Fix issue where Beats started by agent may fail with an 'output unit has no config' error.
+      description: ""
+      component: "elastic-agent"
+      pr:
+        - "https://github.com/elastic/elastic-agent/pull/2138"
+      issue:
+        - "https://github.com/elastic/elastic-agent/issues/2086"
+      timestamp: 1674071325
+      file:
+        name: 1674071325-Fix-issue-where-its-possible-for-a-component-to-receive-a-unit-without-a-config.yaml
+        checksum: d59417809560d08f577ee533bf8c0cb542918634
+    - kind: bug-fix
+      summary: Fix broken deployment using traffic filter by injecting custom headers.
+      description: ""
+      component: "elastic-agent"
+      pr:
+        - "https://github.com/elastic/elastic-agent/pull/2158"
+      issue:
+        - "https://github.com/elastic/beats/issues/32993"
+      timestamp: 1674071326
+      file:
+        name: 1674071326-Fix-deployment-traffic-filter.yaml
+        checksum: d59417809560d08f577ee533bf8c0cb542918634
+    - kind: bug-fix
+      summary: Allow easily filtering only the agent logs from the combined agent log gile.
+      description: ""
+      component: "elastic-agent"
+      pr:
+        - "https://github.com/elastic/elastic-agent/pull/2044"
+      issue:
+        - "https://github.com/elastic/elastic-agent/issues/1810"
+      timestamp: 1674071327
+      file:
+        name: 1674071327-log-filtering.yaml
+        checksum: d59417809560d08f577ee533bf8c0cb542918634
+    - kind: known-issue
+      summary: |
+        OSQuery live query results can take up to 5 mins to show up in Kibana
+      description: ""
+      component: osquery
+      pr:
+        - https://github.com/elastic/elastic-agent/pull/2076
+      issue:
+        - https://github.com/elastic/elastic-agent/issues/2066
+      timestamp: 1672912002
+      file:
+        name: 1672912002-osquery-known-issue.yaml
+        checksum: e0f4d4d25322bd42298f080c62f9a86c361e7af1
+    - kind: known-issue
+      summary: |
+        Adding a Fleet Server integration to an agent that was not bootstrapped with a Fleet Server panics
+      description: ""
+      component: "Fleet-Server"
+      issue:
+        - https://github.com/elastic/elastic-agent/issues/2170
+      timestamp: 1674071328
+      file:
+        name: 1674071328-fleet-server-known-issue.yaml
+        checksum: e0f4d4d25322bd42298f080c62f9a86c361e7af1
\ No newline at end of file
diff --git a/changelog/fragments/1674071325-Fix-issue-where-its-possible-for-a-component-to-receive-a-unit-without-a-config.yaml b/changelog/fragments/1674071325-Fix-issue-where-its-possible-for-a-component-to-receive-a-unit-without-a-config.yaml
deleted file mode 100644
index 508224eff17..00000000000
--- a/changelog/fragments/1674071325-Fix-issue-where-its-possible-for-a-component-to-receive-a-unit-without-a-config.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Kind can be one of:
-# - breaking-change: a change to previously-documented behavior
-# - deprecation: functionality that is being removed in a later release
-# - bug-fix: fixes a problem in a previous version
-# - enhancement: extends functionality but does not break or fix existing behavior
-# - feature: new functionality
-# - known-issue: problems that we are aware of in a given version
-# - security: impacts on the security of a product or a user’s deployment.
-# - upgrade: important information for someone upgrading from a prior version
-# - other: does not fit into any of the other categories
-kind: feature
-
-# Change summary; a 80ish characters long description of the change.
-summary: Fix issue where its possible for a component to receive a unit without a config
-
-# Long description; in case the summary is not enough to describe the change
-# this field accommodate a description without length limits.
-#description:
-
-# Affected component; a word indicating the component this changeset affects.
-component:
-
-# PR number; optional; the PR number that added the changeset.
-# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
-# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
-# Please provide it if you are adding a fragment for a different PR.
-pr: 2138
-
-# Issue number; optional; the GitHub issue related to this changeset (either closes or is part of).
-# If not present is automatically filled by the tooling with the issue linked to the PR number.
-issue: 2086