diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..5dc9147
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,43 @@
+---
+name: Bug Report
+about: Report a bug or unexpected behavior
+title: "[Bug]: "
+labels: [bug, triage]
+assignees: []
+---
+
+## Bug Description
+
+A clear and concise description of the bug.
+
+## Reproduction Steps
+
+1. 
+2. 
+3. 
+
+## Expected Behavior
+
+What should have happened.
+
+## Actual Behavior
+
+What actually happened (include error messages if any).
+
+## Environment
+
+- **Node version** (`node -v`):
+- **OS**:
+- **StellarMind branch/commit**:
+- **Stellar network** (Testnet/Mainnet):
+
+## Additional Context
+
+- Logs (sanitized — no secrets/keys):
+- Screenshots (sanitized — no secrets/keys):
+
+### Security Note
+
+Per our [Security Policy](../SECURITY.md): do NOT include `.env` values, private keys, 
+or Stellar secret seeds in this report. If the bug involves a security vulnerability, 
+report it privately.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..2e30b8c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,44 @@
+---
+name: Feature Request
+about: Propose a new feature or enhancement
+title: "[Feature]: "
+labels: [enhancement, triage]
+assignees: []
+---
+
+## Motivation
+
+Why is this feature needed? What problem does it solve?
+
+## Proposed Solution
+
+A clear description of what you want to happen.
+
+## Acceptance Criteria
+
+- [ ] 
+- [ ] 
+- [ ] 
+
+## Scope
+
+Which part of the system does this touch?
+
+- [ ] Backend (orchestrator, agents, endpoints)
+- [ ] Frontend (dashboard, UI)
+- [ ] Payment (x402, Stellar integration)
+- [ ] Documentation
+- [ ] CI/Infrastructure
+
+## Alternatives Considered
+
+Any alternative approaches you've thought about.
+
+## Additional Context
+
+Add any other context, mockups, or references.
+
+### Security Note
+
+Per our [Security Policy](../SECURITY.md): do NOT include `.env` values, private keys, 
+or Stellar secret seeds.