diff --git a/.github/issue_template.md b/.github/issue_template.md
index e9fe33ee93..50f40146e7 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,50 +1,86 @@
 <!--
 
-For general support, howto, coding and bundling questions, please use the Substrate & Polkadot StackExchange at https://substrate.stackexchange.com/ and get other ecosystem developers involved. This issues in this repository are meant for the tracking of feature requests and bug reports.
+For general support, howto, coding and bundling questions, please
+use the Substrate & Polkadot StackExchange at
 
-While all issues are looked at non-bug and non-features would take quite a bit longer to get to and may yield less than satisfactory responses in this format.
+  https://substrate.stackexchange.com/
 
-Additionally, please ensure you have done a search on the existing and closed issues before logging a new request. This saves time on all sides.
+and get other ecosystem developers involved. This issues in this
+repository are meant for the tracking of feature requests and bug
+reports.
+
+While all issues are looked at non-bug and non-features would take
+quite a bit longer to get to and may yield less than satisfactory
+responses in this format.
+
+Additionally, please ensure you have done a search on the existing
+and closed issues before logging a new request. This saves time on
+all sides.
 
 -->
 
 
 * **I'm submitting a ...**
 
-<!--- Try and classify your actual report -->
+<!---
+
+REQUIRED:
+
+Classify the type of report your are submitting
+
+-->
 
   - [ ] Bug report
   - [ ] Feature request
-  - [ ] Support request (please bear the comments above in mind)
+  - [ ] Support request
   - [ ] Other
 
 
 * **What is the current behavior and expected behavior?**
 
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
+<!---
+
+REQUIRED:
+
+If you're describing a bug, tell us what should happen. If you're
+suggesting a change/improvement, tell us how it should work.
+
+-->
 
 
 * **What is the motivation for changing the behavior?**
 
-<!--- Not obligatory, but suggest a motivation for the request -->
-<!--- or ideas how to implement the addition or change -->
+<!---
+
+OPTIONAL:
+
+Suggest a motivation for the request or ideas how to implement the
+addition or change
+
+-->
 
 
 * **Please tell us about your environment:**
 
-<!--- Include as many relevant details about the environment you experienced the issue in -->
-<!--- Also ensure that you have tested against the latest stable releases if a bug -->
+<!---
+
+REQUIRED:
+
+Include as many relevant details about the environment in which you
+experienced the issue. Also ensure that you have tested against the
+latest stable releases if you believe this to be a bug
+
+-->
 
   - Version:
   - Environment:
 
     - [ ] Node.js
     - [ ] Browser
-    - [ ] Other (limited support for other environments available)
+    - [ ] Other (limited support for other environments)
 
   - Language:
 
     - [ ] JavaScript
-    - [ ] TypeScript
+    - [ ] TypeScript (include tsc --version)
     - [ ] Other