diff --git a/build-tools-internal/src/main/resources/changelog-schema.json b/build-tools-internal/src/main/resources/changelog-schema.json
index c58107caa3cdf..5fb237cd7c964 100644
--- a/build-tools-internal/src/main/resources/changelog-schema.json
+++ b/build-tools-internal/src/main/resources/changelog-schema.json
@@ -25,30 +25,24 @@
             "Authentication",
             "Authorization",
             "Autoscaling",
+            "CAT APIs",
             "CCR",
             "CRUD",
             "Client",
             "Cluster Coordination",
+            "Data streams",
             "Discovery-Plugins",
             "Distributed",
             "EQL",
             "Engine",
             "FIPS",
-            "Data Management/CAT APIs",
-            "Data Management/Data streams",
-            "Data Management/Features",
-            "Data Management/ILM+SLM",
-            "Data Management/Indices APIs",
-            "Data Management/Ingest",
-            "Data Management/Java High Level REST Client",
-            "Data Management/Java Low Level REST Client",
-            "Data Management/Monitoring",
-            "Data Management/Stats",
-            "Data Management/Watcher",
+            "Features",
             "Geo",
             "Graph",
             "Highlighting",
+            "ILM+SLM",
             "IdentityProvider",
+            "Indices APIs",
             "Infra/CLI",
             "Infra/Circuit Breakers",
             "Infra/Core",
@@ -60,9 +54,13 @@
             "Infra/Scripting",
             "Infra/Settings",
             "Infra/Transport API",
+            "Ingest",
+            "Java High Level REST Client",
+            "Java Low Level REST Client",
             "License",
             "Machine Learning",
             "Mapping",
+            "Monitoring",
             "Network",
             "Packaging",
             "Percolator",
@@ -76,11 +74,13 @@
             "Search",
             "Security",
             "Snapshot/Restore",
+            "Stats",
             "Store",
             "Suggesters",
             "TLS",
             "Task Management",
-            "Transform"
+            "Transform",
+            "Watcher"
           ]
         },
         "type": {