diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd84ea7..e7405e7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,29 +10,24 @@ assignees: ''
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
+**Reproduction steps**
+Provide step-by-step instructions so we can reproduce the issue. Include a minimal repo or code snippet if possible.
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
+**Environment info**
+ - OS: [e.g. macOS 14]
+ - Browser: [e.g. Chrome 116]
+ - Node version: [e.g. 20.x]
+ - Package version: [e.g. react-zero-ui@1.0.20]
+
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bbcbbe7..6d47045 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -13,6 +13,17 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
+**Reproduction or use case**
+Provide steps or a short scenario that demonstrates when this feature would be useful.
+
+**Environment info**
+ - OS: [e.g. macOS 14]
+ - Browser: [e.g. Chrome 116]
+ - Node version: [e.g. 20.x]
+
+**Expected behavior**
+What outcome do you expect when this feature is implemented?
+
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..cafe2d9
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,5 @@
+## Checklist
+- [ ] All tests are passing
+- [ ] Documentation updated if needed
+- [ ] Lint and formatting run
+- [ ] PR title and description clearly describe the change