From 3db4b8036e91aec5b41bcf88e8a170d8a3f67510 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Tue, 30 Jun 2026 19:21:14 +0100
Subject: [PATCH 1/5] Make steps to reproduce more visible in bug template

---
 .gitlab/issue_templates/Bug.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 91729a09..1a300cde 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.
@@ -47,6 +45,13 @@ Examples:
 <!--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.

From ebf38f2f70a5769312f159c0077f6e8f159b16cd Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Tue, 30 Jun 2026 19:23:30 +0100
Subject: [PATCH 2/5] Remove level 1 headings

---
 .gitlab/issue_templates/Feature request.md | 2 --
 1 file changed, 2 deletions(-)

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 -->

From 50595d6095b6c4c7aadf38474d1415d4f2999284 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Tue, 30 Jun 2026 20:54:58 +0100
Subject: [PATCH 3/5] Reorder bug template slightly and clarify configuration
 questions

---
 .gitlab/issue_templates/Bug.md | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 1a300cde..442a99aa 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -16,7 +16,7 @@ In 1–2 sentences, describe:
 **Current Behaviour**:
 <!-- Summarise what happened instead -->
 
-### Suggested fix (optional)
+**Current Behaviour (optional)**:
 <!--
 If you have ideas for how this could be resolved, describe them here.
 Examples:
@@ -27,21 +27,7 @@ Examples:
 - suspected root cause
 -->
 
-## Configuration
-<!-- Adjust as appropriate. -->
-
-| Component    | Value |
-| :-------- | :------- |
-| **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 |
-| **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.-->
 
@@ -51,12 +37,26 @@ To reproduce this bug:
 * Step 2
 * ...
 
+## Reproducibility
 
-**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. -->
+
+| Component    | Value |
+| :-------- | :------- |
+| **Server Version** | v2 or v3 |
+| **Release/Branch** | e.g. v3.0.0-alpha1 |
+| **UI** | e.g. Chrome, Firefox, OpenFlexure Connect |
+| **Server Operating System** | e.g. OpenFlexure Raspbian |
+| **Server Python Version (if known)** | e.g. Python 3.13.5 |
+| **Server Operating for UI** | e.g. OpenFlexure Raspbian |
+| **Camera Version** | e.g. Raspberry Pi Camera v2 |
+| **Board Version** | Sangaboard v0.5 |
+
 ## Relevant logs and/or screenshots
 
 <!-- To access your microscope log, either:

From aea260d47dbeb15ea741873ec8a83d208dad9c1a Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Tue, 30 Jun 2026 20:17:30 +0000
Subject: [PATCH 4/5] Apply suggestions from code review of branch
 steps-to-reproduce

---
 .gitlab/issue_templates/Bug.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 442a99aa..39f7a7d8 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -50,10 +50,10 @@ To reproduce this bug:
 | :-------- | :------- |
 | **Server Version** | v2 or v3 |
 | **Release/Branch** | e.g. v3.0.0-alpha1 |
-| **UI** | e.g. Chrome, Firefox, OpenFlexure Connect |
+| **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 |
-| **Server Operating for UI** | e.g. OpenFlexure Raspbian |
+| **Operating System for UI/Client** | e.g. Windows 11 |
 | **Camera Version** | e.g. Raspberry Pi Camera v2 |
 | **Board Version** | Sangaboard v0.5 |
 

From 199a6ebfdc85b3689f73fcd867c5034cc4ccdb2c Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Tue, 30 Jun 2026 20:45:14 +0000
Subject: [PATCH 5/5] Apply suggestions from code review of branch
 steps-to-reproduce

---
 .gitlab/issue_templates/Bug.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 39f7a7d8..72dfd1a2 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -16,7 +16,7 @@ In 1–2 sentences, describe:
 **Current Behaviour**:
 <!-- Summarise what happened instead -->
 
-**Current Behaviour (optional)**:
+**Suggested fix (optional)**:
 <!--
 If you have ideas for how this could be resolved, describe them here.
 Examples: