diff --git a/.gitlab/issue_templates/feature_development_template.md b/.gitlab/issue_templates/feature_development_template.md
new file mode 100644
index 0000000000000000000000000000000000000000..2e854ceec4ec08b03dea31577ef220d9d954dcd4
--- /dev/null
+++ b/.gitlab/issue_templates/feature_development_template.md
@@ -0,0 +1,21 @@
+**Describe the feature**
+
+A clear and concise description of what the feature that should be implemented.
+
+**Development plan**
+
+- [ ] create feature branch from this issue '...'
+- [ ] create submodule  '....'
+- [ ] implement test and methods  '....'
+- [ ] write merge-request
+
+
+**Expected outcome**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.gitlab/issue_templates/incidence_template.md b/.gitlab/issue_templates/incidence_template.md
index 459a09d852732e861b29ccbc39b63322fdf67393..d178c66bdd1dffd177ea8ec32a6bd5bf6640b795 100644
--- a/.gitlab/issue_templates/incidence_template.md
+++ b/.gitlab/issue_templates/incidence_template.md
@@ -7,9 +7,10 @@ A clear and concise description of what the problem is.
 3. Scroll down to '....'
 4. See error
 
-**Damages**
+**Expected behavior**
 A clear and concise description of what you expected to happen.
 
+
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
diff --git a/.gitlab/issue_templates/task_template.md b/.gitlab/issue_templates/task_template.md
deleted file mode 100644
index a3ffb7fcffe50409103610f33424368328cda4f9..0000000000000000000000000000000000000000
--- a/.gitlab/issue_templates/task_template.md
+++ /dev/null
@@ -1,20 +0,0 @@
-**Describe the task**
-A clear and concise description of what the problem is.
-
-**tasks**
-
-- [ ] Go to '...'
-- [ ] Click on '....'
-- [ ] Scroll down to '....'
-- [ ] do some more awesome stuff
-
-
-**Expected outcome**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-
-**Additional context**
-Add any other context about the problem here.