diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..661bc9c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: Andre0512
+
+---
+
+**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**
+If applicable, add screenshots to help explain your problem.
+
+**Environment (please complete the following information):**
+ - Home Assistant Version: [e.g. `2023.6.1`]
+ - hOn Integration Version [e.g. `0.8.1`, can be found in HACS]
+ - pyhOn Version [e.g. `0.13.1`, can be found in device log]
+
+**Additional context**
+Add any other context about the problem here.
+
+**Device Log**
+Post your device info here (if available)
+1. Enable the "Show Device Info" button
+_This button can be found in the diagnostic section of your device or in the entity overview if "show disabled entities" is enabled._
+2. Press the button to create a notification
+3. Open home assistant notifications and copy the message (Crtl+A, Ctrl+C)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..cb133ce
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: Andre0512
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Device Log**
+Post your device info here (if available)
+1. Enable the "Show Device Info" button
+_This button can be found in the diagnostic section of your device or in the entity overview if "show disabled entities" is enabled._
+2. Press the button to create a notification
+3. Open home assistant notifications and copy the message (Crtl+A, Ctrl+C)
+**Additional context**
+Add any other context or screenshots about the feature request here.