diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 8b13789..38ec64b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1 +1,32 @@
+---
+name: 🐛 Bug Report
+about: Report a problem with SAAS - Sleep As Android Status
+title: "[BUG]"
+labels: bug
+assignees: ''
+---
 
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots or Logs**
+If applicable, add screenshots or error logs to help explain your problem.
+
+**System Info:**
+ - Home Assistant Version:
+ - Integration Version:
+ - Device (Mi Band, Zepp, etc):
+ - Android Version:
+
+**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
new file mode 100644
index 0000000..d75d607
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,19 @@
+---
+name: 🚀 Feature Request
+about: Suggest a new idea or feature
+title: "[FEATURE]"
+labels: enhancement
+assignees: ''
+---
+
+**Is your feature request related to a problem?**
+Please describe what you're trying to solve.
+
+**Describe the solution you'd like**
+What should be added, improved, or changed?
+
+**Describe alternatives you've considered**
+Is there a workaround or a different approach?
+
+**Additional context**
+Add any other context or mockups here.