diff --git a/.github/commit-guidelines.md b/.github/commit-guidelines.md
index 31daeb2c97..7667b41b80 100644
--- a/.github/commit-guidelines.md
+++ b/.github/commit-guidelines.md
@@ -4,7 +4,7 @@ These align with the gitlint rules run in CI.
 
 ## Subject (first line)
 
-- Max 72 characters.
+- Min 8, max 72 characters.
 - Use imperative mood when reasonable (e.g., "Fix crash on startup").
 - No trailing punctuation (e.g., don't end with a period).
 - No tabs, no leading/trailing whitespace.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index f0836884d8..ef7a779e90 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -3,16 +3,11 @@
 
 ## CI-ready checklist
 
-- [ ] Commit messages follow `.github/commit-guidelines.md` (subject ≤ 72 chars, no trailing punctuation; if body present, blank line then ≤ 80-char lines).
-- [ ] No whitespace warnings locally:
-  ```powershell
-  git fetch origin
-  git log --check --pretty=format:"---% h% s" origin/<base>..
-  git diff --check --cached
-  ```
-- [ ] Builds/tests pass locally (or I've run the CI-style build via `build.ps1`/`test.ps1` or MSBuild).
+- [ ] Commit messages follow [`.github/commit-guidelines.md`](https://github.com/sillsdev/FieldWorks/blob/main/.github/commit-guidelines.md).
+- [ ] Builds & tests pass locally (or I've run the CI-style build via `build.ps1`, `test.ps1`, or MSBuild).
 - [ ] If this is core-developer AI-assisted work, I followed `Docs/workflows/ai-pr-workflow.md` and ran `pr-preflight` or the equivalent branch-readiness review before requesting review.
 - [ ] For any `Src/**` folders touched, corresponding `AGENTS.md` files are updated or explicitly confirmed still accurate.
+- [ ] I have considered all comments from an AI code reviewer (such as [Devin]https://app.devin.ai/review/sillsdev/FieldWorks/pull/####)
 
 ## Notes for reviewers (optional)
 <!-- Risks, roll-out, docs/tests touched, special validation steps, etc. -->
diff --git a/.gitlint b/.gitlint
index 5554b32881..ec32e0d604 100644
--- a/.gitlint
+++ b/.gitlint
@@ -4,3 +4,6 @@ regex-style-search=true
 [ignore-by-body]
 regex=(?m)^(Agent-Logs-Url:.*|Co-authored-by: Copilot Autofix powered by AI <[0-9]+\+Copilot@users\.noreply\.github\.com>)$
 ignore=B1
+
+[title-min-length]
+min-length=8