diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 7224a590da5..e66490ba39d 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,7 @@
-Do you follow the guidelines?
+Have you followed these guidelines?
 
 - [ ] I have tested my changes
 - [ ] There are no breaking changes
-- [ ] I really tested my changes and there is no regression
-- [ ] Ideally, my commit messages follow the [Conventional Commits specification](https://www.conventionalcommits.org/)
-- [ ] I read this document: https://miniflux.app/faq.html#pull-request
+- [ ] I have thoroughly tested my changes and verified there are no regressions
+- [ ] My commit messages follow the [Conventional Commits specification](https://www.conventionalcommits.org/)
+- [ ] I have read this document: https://miniflux.app/faq.html#pull-request
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index c26957abd58..f0c9d31458d 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -40,3 +40,23 @@ jobs:
         with:
           version: "2024.1.1"
           install-go: false
+
+  commitlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+
+      - name: Install commitlint
+        run: |
+          npm install --save-dev @commitlint/config-conventional @commitlint/cli
+          echo "module.exports = {extends: ['@commitlint/config-conventional']}" > commitlint.config.js
+
+      - name: Validate PR commits
+        run: npx commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }} --verbose