diff --git a/.husky/commit-msg b/.husky/commit-msg
new file mode 100644
index 00000000..2785bc1d
--- /dev/null
+++ b/.husky/commit-msg
@@ -0,0 +1 @@
+yarn commitlint --edit $1
diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100644
index 00000000..39abe4df
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1 @@
+yarn lint
diff --git a/lerna.json b/lerna.json
index 70065880..df9957e1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -24,7 +24,8 @@
         "lerna.json",
         "stylelint.json",
         "**/package.json",
-        "./.github/**"
+        "./.github/**",
+        "./.husky/**"
       ]
     }
   }
diff --git a/package.json b/package.json
index df92a07e..dc661220 100644
--- a/package.json
+++ b/package.json
@@ -103,11 +103,5 @@
     "extends": [
       "@commitlint/config-conventional"
     ]
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "yarn lint",
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
-    }
   }
 }