diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 40122fb3..ab473972 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,6 +4,7 @@ about: "[Bug] Create a report to help us improve"
 title: "[BUG] "
 labels: bug
 assignees: ''
+
 ---
 
 <!-- Thanks for reporting a problem for this project. READ THIS FIRST:
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 47fbdc40..79ce63a9 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: "[Feature Request] Suggest an idea for this project"
 title: "[Feature Request] "
-labels:
+labels: ''
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/waitingforcontent.md b/.github/ISSUE_TEMPLATE/waitingforcontent.md
index d237c419..47d7b015 100644
--- a/.github/ISSUE_TEMPLATE/waitingforcontent.md
+++ b/.github/ISSUE_TEMPLATE/waitingforcontent.md
@@ -1,27 +1,24 @@
 ---
 name: Help - Waiting for Content
 about: "[Help] Waiting for Content"
-title: "[Help] "
-labels: question
+title: "[Help] Waiting for Content"
+labels: configuration, question
 assignees: ''
+
 ---
 
 <!-- Thanks for reporting a problem for this project. READ THIS FIRST:
 
-This issue template is meant to REPORT BUGS/PROBLEMS ONLY
+This issue template is meant to help with Waiting for Content Message ONLY
 
 Please take a few minutes to complete the requested information below.
 The ability to provide assistance is greatly hampered without it.
 
-PLEASE RESTART APPDAEMON BEFORE SUBMITTING AN ISSUE
-To reload all modules after an Update it is reqired to restart the AppDaemon Container, as noted in every Release Notes.
-
 DO NOT DELETE ANY TEXT from this template! Otherwise the issue will be auto-closed.
 -->
 
 
 ### PROBLEM DESCRIPTION
-_A clear and concise description of what the problem is._
 
 I'm seeing the waiting for content message on the Panel and I'm unable to find the configuration issue.
 
@@ -54,4 +51,4 @@ _Make sure your have performed every step and checked the applicable boxes befor
   Log output here:
 
 
-```
\ No newline at end of file
+```