diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml
new file mode 100644
index 0000000000..6151362d49
--- /dev/null
+++ b/.github/workflows/commitlint.yml
@@ -0,0 +1,12 @@
+name: Lint Commit Messages
+on: [pull_request, push]
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: wagoid/commitlint-github-action@v4
+
diff --git a/.husky/commit-msg b/.husky/commit-msg
new file mode 100755
index 0000000000..7fed48507b
--- /dev/null
+++ b/.husky/commit-msg
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx --no -- commitlint --edit 
diff --git a/commitlint.config.js b/commitlint.config.js
new file mode 100644
index 0000000000..28fe5c5bf9
--- /dev/null
+++ b/commitlint.config.js
@@ -0,0 +1 @@
+module.exports = {extends: ['@commitlint/config-conventional']}