diff --git a/.github/release.yml b/.github/release.yml
index 9d6c4f8f..4e41e7ba 100644
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -1,6 +1,13 @@
 changelog:
   categories:
     # refarch-gateway
+    - title: Gateway - 💥 Breaking Changes
+      labels:
+        - BREAKING
+      exclude:
+        labels:
+          - "Component: Integrations"
+          - "Component: CLI"
     - title: Gateway - 🎉 New Features
       labels:
         - "Type: Feature"
@@ -43,15 +50,15 @@ changelog:
         labels:
           - "Component: Integrations"
           - "Component: CLI"
-    - title: Gateway - 💥 Breaking Changes
+
+    # refarch-integrations
+    - title: Integrations - 💥 Breaking Changes
       labels:
         - BREAKING
       exclude:
         labels:
-          - "Component: Integrations"
+          - "Component: API-Gateway"
           - "Component: CLI"
-
-    # refarch-integrations
     - title: Integrations - 🎉 New Features
       labels:
         - "Type: Feature"
@@ -94,15 +101,15 @@ changelog:
         labels:
           - "Component: API-Gateway"
           - "Component: CLI"
-    - title: Integrations - 💥 Breaking Changes
+
+    # refarch-cli
+    - title: CLI - 💥 Breaking Changes
       labels:
         - BREAKING
       exclude:
         labels:
           - "Component: API-Gateway"
-          - "Component: CLI"
-
-    # refarch-cli
+          - "Component: Integrations"
     - title: CLI - 🎉 New Features
       labels:
         - "Type: Feature"
@@ -145,10 +152,3 @@ changelog:
         labels:
           - "Component: API-Gateway"
           - "Component: Integrations"
-    - title: CLI - 💥 Breaking Changes
-      labels:
-        - BREAKING
-      exclude:
-        labels:
-          - "Component: API-Gateway"
-          - "Component: Integrations"