diff --git a/.github/PULL_REQUEST_TEMPLATE/bugfix.md b/.github/PULL_REQUEST_TEMPLATE/bugfix.md
new file mode 100644
index 00000000..0a802512
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/bugfix.md
@@ -0,0 +1,9 @@
+Fixes #<issue-number>
+
+### Summary
+- What changed and why in 1–3 sentences.
+
+### Checklist
+- [ ] Linked to issue(s) above by issue number (e.g. `Closes #<issue-number>`)
+- [ ] One problem per PR (no unrelated changes)
+- [ ] Lints pass; CI green
diff --git a/.github/PULL_REQUEST_TEMPLATE/feature.md b/.github/PULL_REQUEST_TEMPLATE/feature.md
new file mode 100644
index 00000000..0db3f39e
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/feature.md
@@ -0,0 +1,17 @@
+Closes #<issue-number>
+
+### Summary
+
+- What and why in 1–3 sentences.
+
+### UI Changes
+
+- Add before/after images or a short clip.
+
+### Checklist
+
+- [ ] Linked to issue(s) above by issue number (e.g. `Closes #<issue-number>`)
+- [ ] One problem per PR (no unrelated changes)
+- [ ] Lints pass; CI green
+- [ ] Tricky parts are commented in code
+- [ ] Backward compatible with existing device firmware (See `DEVELOPMENT.md` for details)