diff --git a/cliff.toml b/cliff.toml
index 44f89c68602..bdaa51b8015 100644
--- a/cliff.toml
+++ b/cliff.toml
@@ -109,17 +109,16 @@ commit_parsers = [
     { message = "Merge remote-tracking branch 'origin/main' into", skip = true },
 
     # classify commits into sections
-    { message = "feat", group = "<!-- 0 -->:rocket: Features" },
-    { message = "doc", group = "<!-- 2 -->:notebook: Documentation" },
-    { message = "fix", group = "<!-- 1 -->:bug: Bug Fixes" },
-    { message = "perf", group = "<!-- 3 -->:runner: Performance" },
-    { message = "refactor", group = "<!-- 4 -->:sailboat: Refactor" },
-    { message = "style", group = "<!-- 5 -->:nail_care: Styling" },
-    { message = "test", group = "<!-- 6 -->:mag_right: Testing" },
-    { message = "ci:", group = "<!-- 9 -->:mag_right: CI/CD" },
-    { message = "chore", group = "<!-- 7 -->:clipboard: Miscellaneous Tasks" },
+    { message = "feat(\\(.+\\))?:", group = "<!-- 0 -->:rocket: Features" },
+    { message = "(doc|docs)(\\(.+\\))?:", group = "<!-- 2 -->:notebook: Documentation" },
+    { message = "fix(\\(.+\\))?:", group = "<!-- 1 -->:bug: Bug Fixes" },
+    { message = "perf(\\(.+\\))?:", group = "<!-- 3 -->:runner: Performance" },
+    { message = "(refactor|refactoring)(\\(.+\\))?:", group = "<!-- 4 -->:sailboat: Refactor" },
+    { message = "style(\\(.+\\))?:", group = "<!-- 5 -->:nail_care: Styling" },
+    { message = "(test|tests|testing)(\\(.+\\))?:", group = "<!-- 6 -->:mag_right: Testing" },
+    { message = "ci(\\(.+\\))?:", group = "<!-- 9 -->:mag_right: CI/CD" },
+    { message = "chore(\\(.+\\))?:", group = "<!-- 7 -->:clipboard: Miscellaneous Tasks" },
     { body = ".*security", group = "<!-- 8 -->:lock: Security" },
-    { message = ".*(deps|Bump).*", group = "Dependencies"},
     { message = ".*", group = "<!-- 7 -->:clipboard: Miscellaneous Tasks"},
 ]