diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml
new file mode 100644
index 000000000..67e6df3bf
--- /dev/null
+++ b/.github/workflows/commitlint.yml
@@ -0,0 +1,11 @@
+name: Lint Commit Messages
+on: [pull_request]
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: wagoid/commitlint-github-action@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98a08de72..aff92f769 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,3 @@
-# Changelog
-
 ## v1.0.5 - Sep 09 2021
 
 - chore: tweak bundebug colors
diff --git a/commitlint.config.js b/commitlint.config.js
new file mode 100644
index 000000000..4fedde6da
--- /dev/null
+++ b/commitlint.config.js
@@ -0,0 +1 @@
+module.exports = { extends: ['@commitlint/config-conventional'] }
diff --git a/scripts/release.sh b/scripts/release.sh
index d6da06753..189c3355e 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -58,8 +58,9 @@ do
 done
 
 sed --in-place "s/\(return \)\"[^\"]*\"/\1\"${TAG#v}\"/" ./version.go
+conventional-changelog -p angular -i CHANGELOG.md -s
 
 git checkout -b release/${TAG} master
 git add -u
-git commit -m "Release $TAG (release.sh)"
+git commit -m "chore: release $TAG (release.sh)"
 git push origin release/${TAG}