diff --git a/.commitlintrc.json b/.commitlintrc.json
new file mode 100644
index 0000000..d3d7f0c
--- /dev/null
+++ b/.commitlintrc.json
@@ -0,0 +1 @@
+{ "extends": ["@commitlint/config-conventional"] }
diff --git a/.release-it.json b/.release-it.json
index b008551..f70ec3f 100644
--- a/.release-it.json
+++ b/.release-it.json
@@ -1,7 +1,7 @@
 {
   "git": {
     "commit": true,
-    "commitMessage": "🏷 release: v${version}"
+    "commitMessage": "release: v${version}"
   },
   "github": {
     "release": true
diff --git a/.vscode/settings.json b/.vscode/settings.json
index bae9cef..0dc35a0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,47 +2,47 @@
   "gitmoji.onlyUseCustomEmoji": true,
   "gitmoji.addCustomEmoji": [
     {
-      "emoji": "✨ feat:",
+      "emoji": "feat:",
       "code": ":feat:",
       "description": "Introduce new features"
     },
     {
-      "emoji": "🐛 fix:",
+      "emoji": "fix:",
       "code": ":fix:",
       "description": "Fixes a bug for the user (not build/CI related)"
     },
     {
-      "emoji": "💬 content:",
+      "emoji": "content:",
       "code": ":content:",
       "description": "Add or update content"
     },
     {
-      "emoji": "🧹 chore:",
+      "emoji": "chore:",
       "code": ":chore:",
       "description": "Update build system or external dependencies (e.g. gulp tasks)"
     },
     {
-      "emoji": "🏗 ci:",
+      "emoji": "ci:",
       "code": ":ci:",
       "description": "Add or update CI configuration or scripts"
     },
     {
-      "emoji": "📖 docs:",
+      "emoji": "docs:",
       "code": ":docs:",
       "description": "Add or update the documentation"
     },
     {
-      "emoji": "♻️ refactor:",
+      "emoji": "refactor:",
       "code": ":refactor:",
       "description": "Refactor code"
     },
     {
-      "emoji": "🧪 test:",
+      "emoji": "test:",
       "code": ":test:",
       "description": "Add or update tests"
     },
     {
-      "emoji": "🏷 release:",
+      "emoji": "release:",
       "code": ":release:",
       "description": "Publish a release"
     }
diff --git a/package.json b/package.json
index cfb25a9..771adad 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,8 @@
     "react-native-windows": "0.76.2"
   },
   "devDependencies": {
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-conventional": "^17.1.0",
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
     "@babel/runtime": "^7.26.0",