diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 1f0462cd1..c1fc05a88 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,43 +4,37 @@ about: Create a report to help us improve and fix any bugs in our coding
 title: Bug Report
 labels: bug
 assignees: Altify-Development
-
 ---
 
-**Describe the bug**
-![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+R)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+E)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+Q)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+U)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+I)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+R)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+E)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+D)
-
+## Describe the bug
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+R)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+E)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+Q)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+U)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+I)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+R)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+E)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+D)
-
+## To Reproduce
 Steps to reproduce the behavior:
-![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+R)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+E)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+Q)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+U)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+I)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+R)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+E)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+D)
-
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+## Expected behavior
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+## Screenshots
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
-![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+R)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+E)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+Q)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+U)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+I)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+R)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+E)![#f03c15](https://via.placeholder.com/15/f03c15/000000?text=+D)
-
- - 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**
+## System Information
+Please provide the following system information:
+- **OS**: [e.g., Windows 10, macOS Big Sur, Ubuntu 20.04]
+- **Browser**: [e.g., Chrome, Firefox, Safari]
+- **Browser Version**: [e.g., 95.0]
+- **Node.js Version** (if applicable): [e.g., 16.13.0]
+- **Package Version**: [e.g., 1.0.0]
+
+## Logs & Error Messages
+Please provide any relevant error messages or logs:
+```
+Paste error output or logs here
+```
+
+## Additional context
 Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/issue-template.md b/.github/ISSUE_TEMPLATE/issue-template.md
index 404f0b0bc..15e7645e6 100644
--- a/.github/ISSUE_TEMPLATE/issue-template.md
+++ b/.github/ISSUE_TEMPLATE/issue-template.md
@@ -7,8 +7,11 @@ assignees: Altify-Development
 
 ---
 
-Issue tracker is **ONLY** used for reporting bugs. New features should be discussed on our slack channel. Please use [stackoverflow](https://stackoverflow.com) for supporting issues.
+**Issue tracker is ONLY used for reporting bugs.**
 
+For general troubleshooting and usage questions, please use [Stack Overflow](https://stackoverflow.com/). The issue tracker is exclusively for bug reports.
+
+If you're reporting a bug that's related to a feature request, please report the bug here and discuss the feature request separately on our Slack channel.
 <!--- Provide a general summary of the issue in the Title above -->
 
 ## Expected Behavior