diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index c6b2d705..2d4b864f 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -1,5 +1,10 @@
 <!--- Provide a general summary of the issue in the Title above -->
-<!-- You may remove sections that are not related --> 
+<!-- You should remove sections that are not related --> 
+
+## Build Information
+<!-- Issues will be closed if you don't provide this information, as we may need to replicate it on your exact build -->
+Emulator Version:  
+Emulator Build (hash):
 
 ## Expected Behavior
 <!--- Tell us what should happen -->
@@ -8,7 +13,7 @@
 <!--- Tell us what happens instead of the expected behavior -->
 
 ## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- Not obligatory, but suggest a fix/reason for the bug -->
 
 ## Steps to Reproduce
 <!--- Provide a link to a live example, or an unambiguous set of steps to -->
diff --git a/.gitlab/issue_templates/Error.md b/.gitlab/issue_templates/Error.md
new file mode 100644
index 00000000..aa8b89c3
--- /dev/null
+++ b/.gitlab/issue_templates/Error.md
@@ -0,0 +1,29 @@
+<!--- Provide a general summary of the issue in the Title above -->
+<!-- You should remove sections that are not related or use --> 
+
+## Build Information
+<!-- Issues will be closed if you don't provide this information, as we may need to replicate it on your exact build -->
+Emulator Version:  
+Emulator Build (hash):
+
+## What is the error?
+```
+Include your error here. If you have a thread dump, attach it as a txt file
+```
+
+## When does this error occur?
+<!--- Tell us when this error occurs -->
+
+## What is the outcome of this error?
+<!--- What happens after this error occurs? Does the emulator crash? Does the user disconnect?  -->
+
+## Steps to Reproduce
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+1.
+1.
+1.
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug or make a merge request for your solution -->
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Feature.md b/.gitlab/issue_templates/Feature.md
index 21414ec9..92a9067a 100644
--- a/.gitlab/issue_templates/Feature.md
+++ b/.gitlab/issue_templates/Feature.md
@@ -1,5 +1,5 @@
 <!--- Provide a general summary of the feature request in the Title above -->
-<!-- You may remove sections that are not related --> 
+<!-- You should remove sections that are not related --> 
 
 ## Summary
 <!--- Summarize the feature that you want to add -->
diff --git a/.gitlab/issue_templates/Improvement.md b/.gitlab/issue_templates/Improvement.md
new file mode 100644
index 00000000..05b5dd03
--- /dev/null
+++ b/.gitlab/issue_templates/Improvement.md
@@ -0,0 +1,15 @@
+<!--- Provide a general summary of the feature request in the Title above -->
+<!-- You should remove sections that are not related --> 
+
+## Summary
+<!--- Summarize what you're wanting to be improved -->
+
+
+## How the feature functions now
+<!--- Tell us how the feature currently functions -->
+
+## How you want the feature to function
+<!--- Tell us how you want the feature to function -->
+
+## Other information  (e.g. detailed explanation, stacktraces, related issues, suggestions, links for us to have context, eg. stackoverflow, etc)
+<!-- Any other information that you believe will be useful with the implementation of the feature -->