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/Feature Request.md b/.gitlab/issue_templates/Feature Request.md
new file mode 100644
index 0000000..5a11cf5
--- /dev/null
+++ b/.gitlab/issue_templates/Feature Request.md	
@@ -0,0 +1,18 @@
+## Feature Request
+<!-- The reccommended type is: Task -->
+
+### Summary
+<!-- Brief description of the desired functionality -->
+
+### Required workarround
+<!-- Workarround required to achieve x (if applicable) -->
+
+### Description
+<!-- Detailed description of the desired behavior -->
+
+### Checklist
+- [ ] I reproduced the problem using the steps above
+- [ ] I searched documentation docs for relevant information
+- [ ] I added relevant labels
+
+/label ~enhancement
diff --git a/.gitlab/issue_templates/Task.md b/.gitlab/issue_templates/Task.md
new file mode 100644
index 0000000..9455ce6
--- /dev/null
+++ b/.gitlab/issue_templates/Task.md
@@ -0,0 +1,25 @@
+## Task
+<!-- The reccommended type is: Task -->
+
+### Summary
+<!-- What needs to be implemented? -->
+
+### Context
+<!-- Which part of the system does it belong to? -->
+<!-- Examples: Networking, Game-Engine, User interface, ... -->
+
+### Current Progress
+- [ ] 
+- [ ] 
+- [ ] 
+
+### Notes
+<!-- Optional: Implementation hints, links to prior design discussions, etc. -->
+
+### Checklist
+- [ ] I reproduced the problem using the steps above
+- [ ] I searched documentation docs for relevant information
+- [ ] I added relevant labels
+- [ ] I linked to other issues or branches that must be completed first
+
+/label ~task
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
diff --git a/.gitlab/issue_templates/feature_request_client.md b/.gitlab/issue_templates/feature_request_client.md
deleted file mode 100644
index c654230..0000000
--- a/.gitlab/issue_templates/feature_request_client.md
+++ /dev/null
@@ -1,27 +0,0 @@
-## Feature Request
-
-### Summary
-<!-- Brief description of the desired functionality -->
-
-### Motivation / Problem
-<!-- What problem does this feature solve? Why is it needed? -->
-
-### Description
-<!-- Detailed description of the desired behavior -->
-
-### Affected Components
-<!-- Which existing components are affected or need to be extended? -->
-<!-- e.g. Lobby Menu, Global Chat, Loading screen, … -->
-
-### Acceptance Criteria
-<!-- What must be fulfilled for this feature to be considered done? -->
-- [ ] 
-- [ ] 
-- [ ] 
-
-### Open Questions / Trade-offs
-<!-- Are there design decisions that still need to be discussed? -->
-
-/label ~enhancement
-
-/label ~client
diff --git a/.gitlab/issue_templates/feature_request_server.md b/.gitlab/issue_templates/feature_request_server.md
deleted file mode 100644
index 38d3377..0000000
--- a/.gitlab/issue_templates/feature_request_server.md
+++ /dev/null
@@ -1,27 +0,0 @@
-## Feature Request
-
-### Summary
-<!-- Brief description of the desired functionality -->
-
-### Motivation / Problem
-<!-- What problem does this feature solve? Why is it needed? -->
-
-### Description
-<!-- Detailed description of the desired behavior -->
-
-### Affected Components
-<!-- Which existing components are affected or need to be extended? -->
-<!-- e.g. CommandRouter, SessionManager, UserRegistry, … -->
-
-### Acceptance Criteria
-<!-- What must be fulfilled for this feature to be considered done? -->
-- [ ] 
-- [ ] 
-- [ ] 
-
-### Open Questions / Trade-offs
-<!-- Are there design decisions that still need to be discussed? -->
-
-/label ~enhancement
-
-/label ~server
diff --git a/.gitlab/issue_templates/protocol_change.md b/.gitlab/issue_templates/protocol_change.md
deleted file mode 100644
index 6c5d5b2..0000000
--- a/.gitlab/issue_templates/protocol_change.md
+++ /dev/null
@@ -1,37 +0,0 @@
-## Protocol / API Change
-
-### Summary
-<!-- Brief description of the protocol change -->
-
-### Affected Commands / Responses
-<!-- Which commands or response types are being added, changed, or removed? -->
-
-| Command | Response | Type of Change | Description |
-|---------|----------|----------------|-------------|
-|         |          | New / Changed / Removed | |
-
-### New / Changed Syntax
-```
-<!-- Before / after or new command syntax here -->
-<!-- Example:
-BEFORE: LOGIN UNAME=<username> PASS=<password>
-AFTER:  LOGIN USERNAME=<username> PASSWORD=<password>
--->
-```
-
-### Affected Implementation Layers
-<!-- Which components / classes need to be updated? -->
-- [ ] `Session`
-- [ ] `User` or `UserRegistry`
-- [ ] `Tokenizer` / `RequestTokenClassifier`
-- [ ] `ProtocolParser`
-- [ ] `CommandParserDispatcher` + corresponding `CommandParser`
-- [ ] `CommandHandler`
-- [ ] `Response` hierarchy
-- [ ] `GameEngine` or `GameState`
-- [ ] Client-side (create your own issue and create link)
-
-### Motivation
-<!-- Why is this protocol change necessary? -->
-
-/label ~protocol
diff --git a/.gitlab/issue_templates/task_client.md b/.gitlab/issue_templates/task_client.md
deleted file mode 100644
index f75a1c4..0000000
--- a/.gitlab/issue_templates/task_client.md
+++ /dev/null
@@ -1,25 +0,0 @@
-## Task
-
-### Summary
-<!-- What needs to be implemented? -->
-
-### Context
-<!-- Which part of the system does it belong to? -->
-
-### Affected Components
-<!-- e.g. Controller, View, Model, Network, ... -->
-
-### Definition of Done
-- [ ] 
-- [ ] 
-- [ ] 
-
-### Notes
-<!-- Optional: implementation hints, links to prior design discussions, etc. -->
-
-### Checklist
-- [ ] Linked to other issues or branches that must be completed first?
-
-/label ~task
-
-/label ~client
diff --git a/.gitlab/issue_templates/task_server.md b/.gitlab/issue_templates/task_server.md
deleted file mode 100644
index e6206d1..0000000
--- a/.gitlab/issue_templates/task_server.md
+++ /dev/null
@@ -1,25 +0,0 @@
-## Task
-
-### Summary
-<!-- What needs to be implemented? -->
-
-### Context
-<!-- Which part of the system does it belong to? -->
-
-### Affected Components
-<!-- e.g. Response hierarchy, CommandRouter, UserRegistry, ... -->
-
-### Definition of Done
-- [ ] 
-- [ ] 
-- [ ] 
-
-### Notes
-<!-- Optional: implementation hints, links to prior design discussions, etc. -->
-
-### Checklist
-- [ ] Linked to other issues or branches that must be completed first?
-
-/label ~task
-
-/label ~server