diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..64c9033
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,20 @@
+---
+name: Bug report
+about: Something isn't working
+labels: bug
+---
+
+**What happened?**
+
+**What did you expect?**
+
+**Steps to reproduce**
+
+1.
+2.
+3.
+
+**Environment**
+
+- OS: (e.g. Ubuntu 24.04, Arch Linux)
+- Baudbot version: (`cat ~/.pi/agent/baudbot-version.json` or git SHA)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..99b5791
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,11 @@
+---
+name: Feature request
+about: Suggest a new feature or improvement
+labels: enhancement
+---
+
+**What problem does this solve?**
+
+**What does the solution look like?**
+
+**Alternatives considered**
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..90e88c3
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,10 @@
+## What
+
+<!-- What does this PR do? -->
+
+## Checklist
+
+- [ ] Tests pass (`bin/test.sh`)
+- [ ] Lint passes (`npm run lint`)
+- [ ] Docs updated (if behavior changed)
+- [ ] Security audit passes (`bin/security-audit.sh --deep`) — if touching security code