diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md
index 09c85bb712..7f249b49cc 100644
--- a/CHANGELOG.next.md
+++ b/CHANGELOG.next.md
@@ -1,15 +1,20 @@
 <!-- When adding an entry to the Changelog:
+
 - Please follow the Keep a Changelog: http://keepachangelog.com/ guidelines.
 - Please insert your changelog line ordered by PR ID.
+- Make sure you add your entry to the correct section (schema or tooling).
+
 Thanks, you're awesome :-) -->
 
 ## Unreleased
 
-### Breaking changes
+### Schema Changes
+
+#### Breaking changes
 
-### Bugfixes
+#### Bugfixes
 
-### Added
+#### Added
 
 * Added `vulnerability.*` fields to represent vulnerability information. #581
 * Added `event.ingested` as the ingest timestamp. #582
@@ -23,23 +28,39 @@ Thanks, you're awesome :-) -->
 * Added `process.parent.*`. #612
 * Added `process.args_count`. #615
 
-### Improvements
+#### Improvements
+
+#### Deprecated
+
+
+### Tooling and Artifact Changes
 
-### Deprecated
+#### Breaking changes
+
+#### Bugfixes
+
+#### Added
+
+#### Improvements
+
+#### Deprecated
 
 
 <!-- All empty sections:
 
 ## Unreleased
 
-### Breaking changes
+### Schema Changes
+### Tooling and Artifact Changes
+
+#### Breaking changes
 
-### Bugfixes
+#### Bugfixes
 
-### Added
+#### Added
 
-### Improvements
+#### Improvements
 
-### Deprecated
+#### Deprecated
 
 -->