diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..2072ae4c82
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,29 @@
+---
+name: Bug Report
+about: Report a bug to help us improve
+title: '[Bug] '
+labels: bug
+---
+
+## Description
+<!-- A clear description of the bug -->
+
+## Steps to Reproduce
+1.
+2.
+3.
+
+## Expected Behavior
+<!-- What you expected to happen -->
+
+## Actual Behavior
+<!-- What actually happened -->
+
+## Environment
+- Sub2API Version:
+- Deployment Method: [Docker / Binary / Source]
+- OS:
+- Browser (if applicable):
+
+## Additional Context
+<!-- Screenshots, logs, or other relevant information -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..b72c1af242
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,18 @@
+---
+name: Feature Request
+about: Suggest a new feature or improvement
+title: '[Feature] '
+labels: enhancement
+---
+
+## Problem
+<!-- What problem does this feature solve? -->
+
+## Proposed Solution
+<!-- How should this feature work? -->
+
+## Alternatives Considered
+<!-- Any alternative solutions you've considered -->
+
+## Additional Context
+<!-- Any other context, mockups, or examples -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..49ec998135
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,26 @@
+## Summary
+<!-- Brief description of the changes -->
+
+## Changes
+<!-- List key changes -->
+-
+
+## Type of Change
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Breaking change
+- [ ] Documentation update
+- [ ] Refactoring
+- [ ] CI/CD improvement
+
+## Testing
+- [ ] Unit tests pass (`make test-unit`)
+- [ ] Integration tests pass (`make test-integration`)
+- [ ] Frontend tests pass (`pnpm run test:run`)
+- [ ] Linting passes
+
+## Checklist
+- [ ] I have read the [DEV_GUIDE.md](DEV_GUIDE.md)
+- [ ] My code follows the project's coding conventions
+- [ ] I have added tests for my changes (if applicable)
+- [ ] I have updated documentation (if applicable)