diff --git a/.commitlintrc.json b/.commitlintrc.json
new file mode 100644
index 00000000..7a0b0353
--- /dev/null
+++ b/.commitlintrc.json
@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "@commitlint/config-angular"
+  ]
+}
\ No newline at end of file
diff --git a/.github/workflows/ci_commitlint.yml b/.github/workflows/ci_commitlint.yml
new file mode 100644
index 00000000..ee6fd58e
--- /dev/null
+++ b/.github/workflows/ci_commitlint.yml
@@ -0,0 +1,15 @@
+name: Lint Commit Messages
+on:
+  - pull_request
+  - push
+
+permissions:
+  contents: read
+  pull-requests: read
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: wagoid/commitlint-github-action@v6