diff --git a/.commitlintrc.yml b/.commitlintrc.yml
index b9ec7a86c75d0..0848614e8ff84 100644
--- a/.commitlintrc.yml
+++ b/.commitlintrc.yml
@@ -1,6 +1,14 @@
 # Commitlint configuration.
 # See: https://github.com/conventional-changelog/commitlint/blob/master/docs/reference-rules.md
 ---
+parserPreset:
+  parserOpts:
+    headerPattern: '^(\w*)(?:\((.*)\))?!?: (.*)$'
+    breakingHeaderPattern: '^(\w*)(?:\((.*)\))?!: (.*)$'
+    headerCorrespondence: ['type', 'scope', 'subject']
+    noteKeywords: ['BREAKING CHANGE', 'BREAKING-CHANGE']
+    revertPattern: '/^(?:Revert|revert:)\s"?([\s\S]+?)"?\s*This reverts commit (\w*)\./i'
+    revertCorrespondence: ['header', 'hash']
 rules:
   body-leading-blank:
     - 2