diff --git a/.gitlab/issue_templates/assignment.md b/.gitlab/issue_templates/assignment.md
index 400e14dc59e457d17335782e1626d0f7022bf72f..92461d6b16b08e1ced242565df4f13602cd88de8 100644
--- a/.gitlab/issue_templates/assignment.md
+++ b/.gitlab/issue_templates/assignment.md
@@ -11,3 +11,5 @@
 *
 
 
+/label ~"Assignment" /milestone Backlog
+
diff --git a/.gitlab/issue_templates/feature-proposal.md b/.gitlab/issue_templates/feature-proposal.md
new file mode 100644
index 0000000000000000000000000000000000000000..82bf064625a8964639204455de0561e3b8549b6c
--- /dev/null
+++ b/.gitlab/issue_templates/feature-proposal.md
@@ -0,0 +1,22 @@
+# Feature proposal / Enhancement
+
+(Summarize the feature / enhancemen proposal)
+
+
+
+
+## What is the current need for feature/enhancement?
+
+
+
+## Who are stakeholders
+
+
+## Relevant links and/or screenshots
+
+(Paste any relevant links)
+
+
+
+/label ~"Feature Proposal"
+/milestone Backlog
\ No newline at end of file
diff --git a/.gitlab/issue_templates/harjoitus-tehtava.md b/.gitlab/issue_templates/harjoitus-tehtava.md
index b091b282e8959e422549a2b57faf8f331e67fb3a..f73348b24ad49e2776a51d9375905ab557ef994a 100644
--- a/.gitlab/issue_templates/harjoitus-tehtava.md
+++ b/.gitlab/issue_templates/harjoitus-tehtava.md
@@ -8,4 +8,4 @@ Tee seuraavat asiat... ja siirrä sitten "issue" tehtyjen töiden puolelle
 - [] askel
 
 
-/label ~"Personal Task"
+/label ~"Assignment" /milestone Backlog
diff --git a/.gitlab/issue_templates/user-story.md b/.gitlab/issue_templates/user-story.md
index 389473336dee73f4c094c328c44ef91f11bd92b6..b7cc0a31e855e2dd8285aae9e0cc1a0199a1a629 100644
--- a/.gitlab/issue_templates/user-story.md
+++ b/.gitlab/issue_templates/user-story.md
@@ -6,11 +6,20 @@ As a < type of user >, I want < some goal > so that < some reason >.
 
 ## Linked Requirements & Use Cases? 
 
-* ReqID?
-* UseCase?
+* [Link to ReqID]()
+* [Link to UseCase]()
+* [Link to constraint]()
 
+## Definition of done
 
-### Acceptance Criteria
+* Implemented
+* Tested
+* Documented
+* Pair reviewed
+* ?
+
+
+## Acceptance Criterias
 
 - [ ] Check if...
 - [ ] Check also...