diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c5cb60e7..6c03648f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,20 +4,49 @@ about: "[Bug] Create a report to help us improve"
 title: "[BUG] "
 labels: bug
 assignees: ''
-
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+<!-- Thanks for reporting a problem for this project. READ THIS FIRST:
 
-**To Reproduce**
-Steps to reproduce the behavior
+This issue template is meant to REPORT BUGS/PROBLEMS ONLY
 
-**Screenshots**
-If applicable, add a picture to help explain your problem.
+Please take a few minutes to complete the requested information below.
+Our ability to provide assistance is greatly hampered without it. 
 
-**AppDaemon Logs**
-Please check the appdaemon log for any errors add the log to this issue. (Settings > Add-ons > AppDaemon > Log)
+DO NOT DELETE ANY TEXT from this template! Otherwise the issue will be auto-closed.
+-->
 
-**Additional context**
-Add any other context about the problem here.
+### PROBLEM DESCRIPTION
+_A clear and concise description of what the problem is._
+
+
+### REQUESTED INFORMATION
+_Make sure your have performed every step and checked the applicable boxes before submitting your issue. Thank you!_
+
+- [ ] Provide your apps.yaml:
+```
+  apps.yaml here:
+
+
+```
+- [ ] Go to Settings>Add-ons>AppDaemon>Log and then, provide the output of the log during your issue/bug occurs:
+```
+  Log output here:
+
+
+```
+
+### TO REPRODUCE
+_Steps to reproduce the behavior:_
+
+
+### EXPECTED BEHAVIOUR
+_A clear and concise description of what you expected to happen._
+
+
+### SCREENSHOTS
+_If applicable, add screenshots/pictures to help explain your problem._
+
+
+### ADDITIONAL CONTEXT
+_Add any other context about the problem here._
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 3510b1f7..835831f8 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -7,11 +7,22 @@ assignees: ''
 
 ---
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+<!-- Thanks for reporting a problem for this project. READ THIS FIRST:
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+This issue template is meant to REPORT BUGS/PROBLEMS ONLY
 
-**Panel / Firmware Version**
-Please add the Panel/Firmware Version you are using (EU, US-L or US-P)
+Please take a few minutes to complete the requested information below.
+Our ability to provide assistance is greatly hampered without it. 
+
+DO NOT DELETE ANY TEXT from this template! Otherwise the issue will be auto-closed.
+-->
+
+### FEATURE DESCRIPTION
+_A clear and concise description of what the problem is._
+
+
+### ADDITIONAL CONTEXT
+_Add any other context about the problem here._
+
+### PANEL / FIRMWARE VERION
+_Please add the Panel/Firmware Version you are using (EU, US-L or US-P)_