diff --git a/.github/PULL_REQUEST_TEMPLATE/bugfix.md b/.github/PULL_REQUEST_TEMPLATE/bugfix.md
new file mode 100644
index 00000000..074f5bd9
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/bugfix.md
@@ -0,0 +1,9 @@
+Fixes #<issue-number>
+
+Summary of the fix
+- 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..4e5f59af
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/feature.md
@@ -0,0 +1,18 @@
+Closes #<issue-number>
+
+Summary
+
+- What and why in 1–3 sentences.
+
+Screenshots/videos (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
+- [ ] Internationalization (see `DEVELOPMENT.md` for details)
+- [ ] Backward compatible with existing device firmware (See `DEVELOPMENT.md` for details)