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