diff --git a/.commitlintrc.json b/.commitlintrc.json
index 10d7aa21fc10d0921f80665cc9d8a928df8dc558..1ca0183495f47a9e6cab980155aeb679cd2624f1 100644
--- a/.commitlintrc.json
+++ b/.commitlintrc.json
@@ -1,4 +1,4 @@
 {
-  "extends": ["@commitlint/config-angular"],
+  "extends": ["@commitlint/config-conventional"],
   "rules": {}
 }
diff --git a/package.json b/package.json
index 958b950732e73c20fe807924c52bd749ad1a07f2..98b1999355025e2ce0875f4f3e8b20eceba073ae 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   },
   "private": true,
   "dependencies": {
+    "@commitlint/config-conventional": "^16.0.0",
     "@reduxjs/toolkit": "^1.7.1",
     "@types/react-grid-layout": "^1.3.0",
     "@types/styled-components": "^5.1.21",
diff --git a/yarn.lock b/yarn.lock
index c664650c93d79267d668282f3edb7be8f4b19757..fc458d50301af293f8ac085e2bb3424eafc557b1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1318,6 +1318,13 @@
   dependencies:
     "@commitlint/config-angular-type-enum" "^16.0.0"
 
+"@commitlint/config-conventional@^16.0.0":
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-16.0.0.tgz#f42d9e1959416b5e691c8b5248fc2402adb1fc03"
+  integrity sha512-mN7J8KlKFn0kROd+q9PB01sfDx/8K/R25yITspL1No8PB4oj9M1p77xWjP80hPydqZG9OvQq+anXK3ZWeR7s3g==
+  dependencies:
+    conventional-changelog-conventionalcommits "^4.3.1"
+
 "@commitlint/config-validator@^16.1.0":
   version "16.1.0"
   resolved "https://registry.yarnpkg.com/@commitlint/config-validator/-/config-validator-16.1.0.tgz#410979f713ed55cbb85504d46295c1fd2419dc4d"
@@ -6639,7 +6646,7 @@ conventional-changelog-conventionalcommits@4.6.1:
     lodash "^4.17.15"
     q "^1.5.1"
 
-conventional-changelog-conventionalcommits@^4.5.0:
+conventional-changelog-conventionalcommits@^4.3.1, conventional-changelog-conventionalcommits@^4.5.0:
   version "4.6.3"
   resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.3.tgz#0765490f56424b46f6cb4db9135902d6e5a36dc2"
   integrity sha512-LTTQV4fwOM4oLPad317V/QNQ1FY4Hju5qeBIM1uTHbrnCE+Eg4CdRZ3gO2pUeR+tzWdp80M2j3qFFEDWVqOV4g==