diff --git a/.commitlintrc.yaml b/.commitlintrc.yaml
new file mode 100644
index 0000000..7fee410
--- /dev/null
+++ b/.commitlintrc.yaml
@@ -0,0 +1,18 @@
+rules:
+  body-leading-blank: [1, always]
+  body-max-line-length: [2, always, 72]
+  footer-leading-blank: [1, always]
+  footer-max-line-length: [2, always, 72]
+  header-max-length: [2, always, 50]
+  subject-case:
+    - 2
+    - never
+    - [sentence-case, start-case, pascal-case, upper-case]
+  subject-empty: [2, never]
+  subject-full-stop: [2, never, "."]
+  type-case: [2, always, lower-case]
+  type-empty: [2, never]
+  type-enum:
+    - 2
+    - always
+    - [build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test]
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 185565d..1243b6f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -27,19 +27,27 @@ repos:
       stages: [pre-commit]
 
   - repo: https://github.com/dronetag/pre-commit-hooks
-    rev: v1.1.1
+    rev: v1.0.0
+    hooks:
+    - id: check-email-domain
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
     hooks:
     - id: check-added-large-files
     - id: check-docstring-first
-    - id: check-email-domain
     - id: check-json
     - id: check-toml
     - id: check-yaml
     - id: check-merge-conflict
-    - id: conventional-commit-msg
-    - id: debug-statements
     - id: detect-private-key
     - id: mixed-line-ending
       args: [--fix=lf]
     - id: end-of-file-fixer
     - id: trailing-whitespace
+
+  - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
+    rev: v9.13.0
+    hooks:
+    - id: commitlint
+      stages: [commit-msg]