diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..7f23f05f7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,27 @@
+---
+name: Bug Report
+about: Something isn't working
+labels: bug
+---
+
+**What happened?**
+
+
+**What did you expect?**
+
+
+**Steps to reproduce**
+1.
+2.
+3.
+
+**Environment**
+- gbrain version: (`gbrain version`)
+- OS:
+- Bun version: (`bun --version`)
+- Database: Supabase / self-hosted Postgres
+
+**`gbrain doctor --json` output**
+```json
+(paste output here)
+```
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..3f7a4cd09
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,14 @@
+---
+name: Feature Request
+about: Suggest an improvement
+labels: enhancement
+---
+
+**What problem does this solve?**
+
+
+**What does the solution look like?**
+
+
+**Alternatives considered**
+
diff --git a/.gitignore b/.gitignore
index 2d845166f..8d7ebe96b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ bin/
 .env.testing
 .18a49dfd730ff378-00000000.bun-build
 .18a49f9dfb996f70-00000000.bun-build
+.gstack/