diff --git a/.husky/commit-msg b/.husky/commit-msg
new file mode 100755
index 000000000..d71a03b9f
--- /dev/null
+++ b/.husky/commit-msg
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn commitlint --edit $1
diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100755
index 000000000..d2ae35e84
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn lint-staged
diff --git a/package.json b/package.json
index 30e5bab44..b535e045a 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,8 @@
     "cm": "git-cz",
     "clean-reports": "rm -rf cypress/reports",
     "merge-report": "mochawesome-merge ./cypress/reports/separate-reports/*.json > ./cypress/reports/full_report.json",
-    "generate-report": "npx mochawesome-report-generator --reportDir cypress/reports cypress/reports/full_report.json"
+    "generate-report": "npx mochawesome-report-generator --reportDir cypress/reports cypress/reports/full_report.json",
+    "prepare": "husky install"
   },
   "workspaces": [
     "packages/**",
@@ -77,7 +78,7 @@
     "eslint-plugin-react": "^7.18.0",
     "eslint-plugin-react-hooks": "^4.0.0",
     "git-cz": "4.7.6",
-    "husky": "^6.0.0",
+    "husky": "^7.0.0",
     "lerna": "^3.20.2",
     "lint-staged": "10.5.4",
     "mocha": "^8.0.1",
@@ -136,12 +137,6 @@
       "remark-validate-links"
     ]
   },
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-commit": "lint-staged"
-    }
-  },
   "engines": {
     "node": ">=12.8.1",
     "yarn": ">=1.21.1"
diff --git a/yarn.lock b/yarn.lock
index 89ecf4bc3..a6dad7f75 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11789,10 +11789,10 @@ humanize-string@^2.1.0:
   dependencies:
     decamelize "^2.0.0"
 
-husky@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-6.0.0.tgz#810f11869adf51604c32ea577edbc377d7f9319e"
-  integrity sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==
+husky@^7.0.0:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535"
+  integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==
 
 iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
   version "0.4.24"