diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..55e4e90fd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,37 @@
+---
+name: Bug Report
+about: Report a bug or unexpected behavior
+title: '[Bug] '
+labels: bug
+assignees: ''
+---
+
+> **⚠️ Security Issues**: If you've discovered a security vulnerability, **do not** open a public issue. Please report it responsibly by emailing **team@self.xyz** instead.
+
+## Description
+
+_A clear and concise description of what the bug is._
+
+## Steps to Reproduce
+
+1.
+2.
+3.
+
+## Expected Behavior
+
+_What you expected to happen._
+
+## Actual Behavior
+
+_What actually happened._
+
+## Environment (optional)
+
+- Workspace: _e.g., app, circuits, contracts, sdk/core, etc._
+- Platform: _e.g., iOS, Android, Web_
+- Version: _if applicable_
+
+## Additional Context
+
+_Any other context, logs, or screenshots that might help._
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..d035793d5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,29 @@
+---
+name: Feature Request / Contribution
+about: Suggest a new feature or propose a contribution
+title: '[Feature] '
+labels: enhancement
+assignees: ''
+---
+
+> **💡 For Complex Features**: If your contribution targets core components or introduces complex features, please open an issue first to discuss your implementation plan before starting development. See [contribute.md](https://github.com/selfxyz/self/blob/dev/contribute.md) for guidelines.
+
+## Description
+
+_A clear description of what you want to build or contribute._
+
+## Motivation
+
+_Why is this feature useful? What problem does it solve?_
+
+## Proposed Solution (optional)
+
+_If you have ideas on how to implement this, describe them here._
+
+## Workspace (optional)
+
+_Which workspace(s) would this affect? (e.g., app, circuits, contracts, sdk/core, etc.)_
+
+## Additional Context
+
+_Any other context, mockups, or examples._