diff --git a/.github/release-draft-template.yml b/.github/release-draft-template.yml
index 1088be33b..ffe2fa5b7 100644
--- a/.github/release-draft-template.yml
+++ b/.github/release-draft-template.yml
@@ -3,17 +3,27 @@ tag-template: 'v$RESOLVED_VERSION'
 exclude-labels:
   - 'skip changelog'
 version-resolver:
-  major:
-    labels:
-      - 'breaking-change'
   minor:
     labels:
       - 'enhancement'
   default: patch
+categories:
+  - title: '⚠️ Breaking changes'
+    label: 'breaking-change'
+  - title: '🚀 Enhancements'
+    label: 'enhancement'
+  - title: '🐛 Bug Fixes'
+    label: 'bug'
+  - title: '🔒 Security'
+    label: 'security'
+  - title: '⚙️ Maintenance/misc'
+    label:
+      - 'maintenance'
+      - 'documentation'
 template: |
   $CHANGES
 
-  Thanks again to $CONTRIBUTORS! 🎉
+  ❤️  Huge thanks to our contributors: $CONTRIBUTORS.
 no-changes-template: 'Changes are coming soon 😎'
 sort-direction: 'ascending'
 replacers: