diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md
new file mode 100644
index 00000000..2ea43bc1
--- /dev/null
+++ b/.claude/CLAUDE.md
@@ -0,0 +1,3 @@
+## Pull Requests
+When creating PRs, always read and follow the template at `.github/pull_request_template.md`.
+Use `--body-file .github/pull_request_template.md` with `gh pr create`, then fill in each section appropriately based on the changes.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000..9a1887f5
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,22 @@
+<!-- PR title format: follow Conventional Commits style, e.g.
+     feat: add new postgres minor release images
+     fix: correctly mark stale instances as unknown
+     docs: add database migration guide
+     Common types: feat, fix, docs, chore, test, refactor, build(release)
+     See: https://www.conventionalcommits.org/en/v1.0.0/#summary
+-->
+## Summary
+
+<!-- Briefly describe what changed and why. Link to a GitHub issue if appropriate.  -->
+
+## Checklist
+
+- [ ] Tests added or updated (unit, regression, integration as needed)
+- [ ] Docs/README updated (or not, with justification)
+- [ ] Issue is linked (branch name or URL in PR description)
+- [ ] Security checks (no secrets, vulnerabilities)
+- [ ] Breaking changes (if any) are clearly called out in the PR description
+
+## Notes for Reviewers
+
+<!-- Instructions to help with the review including known limitations, design rationale, or follow-up tasks. -->