diff --git a/.changelog/11945.txt b/.changelog/11945.txt
index 71882cff0..108681103 100644
--- a/.changelog/11945.txt
+++ b/.changelog/11945.txt
@@ -1,3 +1,3 @@
 ```release-note:bug
-Fixed a bug where successful poststart tasks were marked as unhealthy
+lifecycle: Fixed a bug where successful poststart tasks were marked as unhealthy
 ```
diff --git a/.changelog/12274.txt b/.changelog/12274.txt
index 3f47ae714..a55e92b00 100644
--- a/.changelog/12274.txt
+++ b/.changelog/12274.txt
@@ -1,3 +1,3 @@
 ```release-note:improvement
-Enable support for cgroups v2
+client: Enable support for cgroups v2
 ```
diff --git a/.changelog/12369.txt b/.changelog/12369.txt
index 9bd255b12..5671e91f0 100644
--- a/.changelog/12369.txt
+++ b/.changelog/12369.txt
@@ -1,3 +1,3 @@
 ```release-note:bug
-Write peers.json file with correct permissions
+server: Write peers.json file with correct permissions
 ```
diff --git a/.changelog/12419.txt b/.changelog/12419.txt
index da29f0c0c..afefd3e50 100644
--- a/.changelog/12419.txt
+++ b/.changelog/12419.txt
@@ -1,3 +1,3 @@
 ```release-note:improvement
-Add support for cgroups v2 in raw_exec driver
+drivers/raw_exec: Add support for cgroups v2 in raw_exec driver
 ```
diff --git a/.changelog/changelog.tmpl b/.changelog/changelog.tmpl
index 7c3cdc8f2..4a2efa244 100644
--- a/.changelog/changelog.tmpl
+++ b/.changelog/changelog.tmpl
@@ -6,7 +6,7 @@ FEATURES:
 {{ end -}}
 {{- end -}}
 
-{{- if index .NotesByType "breaking-change" -}}
+{{- if index .NotesByType "breaking-change" }}
 BREAKING CHANGES:
 
 {{range index .NotesByType "breaking-change" -}}
@@ -53,4 +53,3 @@ NOTES:
 * {{ template "note" . }}
 {{ end -}}
 {{- end -}}
-