diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 86300792..0dbbc281 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -2,31 +2,33 @@
 
 ## Summary
 
-(Summarize the bug encountered concisely)
+<!-- Summarise the bug encountered concisely -->
 
 ## Configuration
+<!-- Adjust as appropriate. -->
 
-I'm using:
-
-**Camera:** (E.g. Raspberry Pi camera v2)
-
-**Motor controller:** (E.g. Sangaboard, or Arduino Nano)
+* **Sever version**: v2 or v3
+* **Release/Branch**: e.g. v3.0.0-alpha1
+* **Hardware Configuration:** 
+  * Raspberry Pi Camera v2
+  * Sangabouard v0.5
 
 ## Steps to reproduce
 
-(How one can reproduce the issue - this is very important)
+<!--How to reproduce the issue - this is very important-->
 
 ## Relevant logs and/or screenshots
 
-To access your microscope log, either:
+<!-- To access your microscope log, either:
 
 * Run `ofm log` on your microscope, and copy/paste the output here
 
 * Go to `http://<your microscope IP>:5000/logfile`, download the log file, and attach it here using the "Attach a File" button below
-  * In most setups, `http://microscope.local:5000/logfile` should work
+  * In most setups, `http://microscope.local:5000/logfile` should work-->
+
 
 ## Additional details
 
-(Anything else you think might be relevant to mention)
+<!--Anything else you think might be relevant to mention-->
 
-/label ~bug
+/label ~bug <!-- ~"Severity::Medium" ~"sever version::v3"   -->
diff --git a/.gitlab/issue_templates/Feature request.md b/.gitlab/issue_templates/Feature request.md
index b3230205..5b5f999f 100644
--- a/.gitlab/issue_templates/Feature request.md	
+++ b/.gitlab/issue_templates/Feature request.md	
@@ -2,18 +2,18 @@
 
 ## Summary
 
-(Summarize the bug encountered concisely)
+<!-- Summarise the feature concisely -->
 
-## Configuration
-
-I'm using:
-
-**Camera:** (E.g. Raspberry Pi camera v2)
-
-**Motor controller:** (E.g. Sangaboard, or Arduino Nano)
 
 ## Additional details
 
-(Anything else you think might be relevant to mention)
+<!--Anything else you think might be relevant to mention, such as who would benefit from the change,
 
-/label ~feature
+This could include sections such as:
+
+## Implementation strategy
+
+-->
+
+
+/label ~feature <!-- ~"Severity::Medium" ~"sever version::v3"   -->