diff --git a/.commitlintrc.js b/.commitlintrc.js
index f97048188..5ec16b36e 100644
--- a/.commitlintrc.js
+++ b/.commitlintrc.js
@@ -40,8 +40,8 @@ module.exports = {
         },
     ],
     rules: {
-        "body-max-line-length": [1, "always", cz.maxLineWidth], /* Warning */
         "header-max-length": [1, "always", cz.maxHeaderWidth], /* Warning */
+        "body-max-line-length": [1, "always", cz.maxLineWidth], /* Warning */
 
         "change-id-exists": [1, "always", "Change-Id:"], /* Warning */
         "signed-off-by-exists": [1, "always", "Signed-off-by:"], /* Warning */
diff --git a/.cz.json b/.cz.json
index 3c28d3c07..005153af3 100644
--- a/.cz.json
+++ b/.cz.json
@@ -824,6 +824,10 @@
                     "title": "checkpatch",
                     "scopes": ["checkpatch"]
                 },
+                {
+                    "title": "commitlint",
+                    "scopes": ["commitlint"]
+                },
                 {
                     "title": "libfdt",
                     "scopes": ["libfdt"]