diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 91729a09..72dfd1a2 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -1,5 +1,3 @@
-# Bug report
-
 ## Summary
 
 - [ ] I have searched existing issues to ensure this hasn't been reported.
@@ -18,7 +16,7 @@ In 1–2 sentences, describe:
 **Current Behaviour**:
 <!-- Summarise what happened instead -->
 
-### Suggested fix (optional)
+**Suggested fix (optional)**:
 <!--
 If you have ideas for how this could be resolved, describe them here.
 Examples:
@@ -29,6 +27,22 @@ Examples:
 - suspected root cause
 -->
 
+## Steps to reproduce
+<!--How to reproduce the issue - this is very important-->
+<!--Be very clear about what condition triggers the bug. This is especially important for intermittent bugs.-->
+
+To reproduce this bug:
+
+* Step 1
+* Step 2
+* ...
+
+## Reproducibility
+
+- [ ] **Consistent:** Happens every time.
+- [ ] **Intermittent:** Happens roughly [X]% of the time or every [X] scans/clicks.
+- [ ] **One-off:** Only happened once so far.
+
 ## Configuration
 <!-- Adjust as appropriate. -->
 
@@ -36,22 +50,13 @@ Examples:
 | :-------- | :------- |
 | **Server Version** | v2 or v3 |
 | **Release/Branch** | e.g. v3.0.0-alpha1 |
-| **UI** | e.g. Chrome, Firefox, OpenFlexure Connect |
-| **Operating System** | e.g. Windows 11 |
-| **Python Version** | e.g. Python 3.13.12 |
+| **UI/Client** | e.g. Chrome, Firefox, OpenFlexure Connect |
+| **Server Operating System** | e.g. OpenFlexure Raspbian |
+| **Server Python Version (if known)** | e.g. Python 3.13.5 |
+| **Operating System for UI/Client** | e.g. Windows 11 |
 | **Camera Version** | e.g. Raspberry Pi Camera v2 |
 | **Board Version** | Sangaboard v0.5 |
 
-## Steps to reproduce
-
-<!--How to reproduce the issue - this is very important-->
-<!--Be very clear about what condition triggers the bug. This is especially important for intermittent bugs.-->
-
-**Reproducibility:**
-- [ ] **Consistent:** Happens every time.
-- [ ] **Intermittent:** Happens roughly [X]% of the time or every [X] scans/clicks.
-- [ ] **One-off:** Only happened once so far.
-
 ## Relevant logs and/or screenshots
 
 <!-- To access your microscope log, either:
diff --git a/.gitlab/issue_templates/Feature request.md b/.gitlab/issue_templates/Feature request.md
index 5b5f999f..39807f3c 100644
--- a/.gitlab/issue_templates/Feature request.md	
+++ b/.gitlab/issue_templates/Feature request.md	
@@ -1,5 +1,3 @@
-# Feature request
-
 ## Summary
 
 <!-- Summarise the feature concisely -->