diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 901df2fd..ffcce291 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,24 +1,24 @@
 ---
 name: Bug report
 about: Report a bug
-title: "[Bug]"
-labels: bug
-assignees: 'tr7zw'
 
 ---
 
-**Describe the bug**
-
-**To Reproduce**
-Steps to reproduce the behavior:
-
 **Expected behavior**
-A clear and concise description of what you expected to happen.
+<!-- Tell us what behavior is expected --> 
 
-**Server Setup**
-Server Specifications:
+**Observed behavior**
+<!-- Tell us what is happening -->
 
-Plugins used:
+**Steps to reproduce (if known)**
+<!-- Tell us how did you make this happen
+     details are always useful -->
+
+**Installed plugins**
+<!-- Give us a screenshot of your /plugins -->
+
+**Version**
+<!-- This can be seen by the output of /version . Just screenshot that and give it to us -->
 
 **Additional context**
-Add any other context about the problem here.
+<!-- Anything other you want us to know -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index cc0b5f8f..a02802e3 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,10 +1,17 @@
 ---
 name: Feature request
 about: Suggest a feature or enhancement
-title: "[Enhancement]"
-labels: enhancement
-assignees: ''
 
 ---
 
-**Describe the feature (Make sure it is not an API Change, Yatopia does not accept those) and be specific.**
+**Describe what do you want us to implement**
+<!-- Give a description of the feature request.
+     API changes which are not additions is a no-no so
+     don't waste our time -->
+
+**Is your feature request related to a problem**
+<!-- Describe whether or not the feature fixes a bug/incompatibility -->
+
+**Additional context**
+<!-- Anything other you want us to know -->
+