diff --git a/.commitlintrc.yaml b/.commitlintrc.yaml
new file mode 100644
index 000000000..247ff21e6
--- /dev/null
+++ b/.commitlintrc.yaml
@@ -0,0 +1,3 @@
+extends:
+  - "@commitlint/config-conventional"
+    
\ No newline at end of file
diff --git a/.husky/commit-msg b/.husky/commit-msg
new file mode 100755
index 000000000..1dc88ef6c
--- /dev/null
+++ b/.husky/commit-msg
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+pnpm commitlint --edit "$1"
diff --git a/package.json b/package.json
index a42fc2b18..bd2717fdf 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,12 @@
     "prettier": "^2.0.5"
   },
   "devDependencies": {
-    "hardhat": "^2.12.4"
+    "@commitlint/config-conventional": "^19.1.0",
+    "commitlint": "^19.2.1",
+    "hardhat": "^2.12.4",
+    "husky": "^9.0.11"
+  },
+  "scripts": {
+    "prepare": "husky"
   }
 }