diff --git a/.gitlab/issue_templates/Bug Report.md b/.gitlab/issue_templates/Bug Report.md
new file mode 100644
index 0000000..4fcd233
--- /dev/null
+++ b/.gitlab/issue_templates/Bug Report.md	
@@ -0,0 +1,40 @@
+## Bug Report
+<!-- The reccommended type is: Issue -->
+
+### Environment
+- **Branch & Commit:**
+- **Operating system:**
+- **How was execution started (Gradle task / IDE debug / IDE run):**
+- **Java version:** `25`
+- **Gradle version**: `9.3.1`
+
+### Summary
+<!-- Short, precise description of the bug -->
+
+### Expected Behavior
+<!-- What you expected to happen -->
+
+### Actual Behavior
+<!-- What actually happened instead -->
+
+### Steps to Reproduce
+<!--
+1. Do this first
+2. Then do that next
+3. Lastly, see the unexprected ...
+-->
+
+### Stack Trace / Error Message
+```
+<!-- Paste stack trace or log output here -->
+```
+
+### Possible Cause / Notes
+<!-- Optional: your own hypothesis about the root cause -->
+
+### Checklist
+- [ ] I reproduced the problem using the steps above
+- [ ] I searched documentation docs for relevant information
+- [ ] I added relevant labels
+
+/label ~bug
diff --git a/.gitlab/issue_templates/bug_report_client.md b/.gitlab/issue_templates/bug_report_client.md
deleted file mode 100644
index d1b4373..0000000
--- a/.gitlab/issue_templates/bug_report_client.md
+++ /dev/null
@@ -1,31 +0,0 @@
-## Bug Report
-
-### Summary
-<!-- Short, precise description of the bug -->
-
-### Affected Component
-<!-- e.g. Lobby Menu, Global Chat, Loading screen, ... -->
-
-### Steps to Reproduce
-1. Do this first
-2. Then do that next
-3. Lastly, see the unexprected error message ...
-
-### Expected Behavior
-<!-- What should happen? -->
-
-### Actual Behavior
-<!-- What happens instead? -->
-
-### Stack Trace / Error Message
-```
-<!-- Paste stack trace or log output here -->
-```
-
-### Possible Cause
-<!-- Optional: your own hypothesis about the root cause -->
-
-
-/label ~bug
-
-/label ~client
diff --git a/.gitlab/issue_templates/bug_report_server.md b/.gitlab/issue_templates/bug_report_server.md
deleted file mode 100644
index 46d7572..0000000
--- a/.gitlab/issue_templates/bug_report_server.md
+++ /dev/null
@@ -1,30 +0,0 @@
-## Bug Report
-
-### Summary
-<!-- Short, precise description of the bug -->
-
-### Affected Component
-<!-- e.g. TransportLayer, CommandRouter, UserRegistry, Response, ... -->
-
-### Steps to Reproduce
-1. Do this first
-2. Then do that next
-3. Lastly, see the unexprected error message ...
-
-### Expected Behavior
-<!-- What should happen? -->
-
-### Actual Behavior
-<!-- What happens instead? -->
-
-### Stack Trace / Error Message
-```
-<!-- Paste stack trace or log output here -->
-```
-
-### Possible Cause
-<!-- Optional: your own hypothesis about the root cause -->
-
-/label ~bug
-
-/label ~server