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