diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md
index fdd5972..9485632 100644
--- a/.gitlab/issue_templates/bug.md
+++ b/.gitlab/issue_templates/bug.md
@@ -12,8 +12,9 @@
 
 (How one can reproduce the issue - this is very important)
 
-Step 1
-Step 2
+1. Step 1
+1. Step 2
+1. Step 3
 
 ### Relevant logs and/or screenshots
 
diff --git a/.gitlab/issue_templates/documentation.md b/.gitlab/issue_templates/documentation.md
deleted file mode 100644
index cd217fe..0000000
--- a/.gitlab/issue_templates/documentation.md
+++ /dev/null
@@ -1,71 +0,0 @@
-### Feature: `Role or Persona` `Priority` `Objective`
-
-`Role or persona` What kind of users are we talking about in this particular user story?
-`Priority` We need to ask users about how important each feature is. Using the MoSCow method to prioritize requirements. This method is based on four main categories: must, should, could, and won't.
-`Objective` What is the users' final objective by using this feature?
-
-*Example*
-
-> Feature: User must log in to access the app.
-
-#### User story:
-
-As a `role or persona`
-I `must/should/could/won't` `goal/need`
-So that `value`
-
-*Example*
-
-> User story:
->
->  As a user,
->  I must be sent a link to reinitialize password when requested,
->  So that I can log in and access the app.
-
-#### Acceptance criteria
-
-
-###### Scenario-oriented acceptance criteria
-
-`Scenario` the name for the behavior that will be described
-- `Given` the beginning state of the scenario
-- `When` specific action that the user makes
-- `Then` the outcome of the action in “When”
-- `And` used to continue any previous statement
-
-*Example*
-
-> Scenario: User Forgot password
->  - Given: The user has navigated to the login page
->  - When: The user selected forgot password option
->  - And: Entered a valid email to receive a link for password recovery
->  - Then: The system sent the link to the entered email
->  - Given: The user received the link via the email
->  - When: The user navigated through the link received in the email
->  - Then: The system enables the user to set a new password
-
-
-###### Rule-oriented acceptance criteria format
-
-In some cases, it’s difficult to fit acceptance criteria into the Given/When/Then structure. For instance, design and UX features. Also when visuals exist they should be linked.
-
-- [ ] item 1
-    - [ ] item 1-1
-    - [ ] item 1-2
-    - [ ] item 1-3
-    - [ ] item 1-4
-- [ ] item 2
-    - [ ] item 2-1
-    - [ ] item 2-2
-    - [ ] item 2-3
-    - [ ] item 2-4
-
-*Example*
-
-> - [ ] Basic new password interface acceptance criteria
->     - [ ] Password must be > 8 characters
->     - [ ] Password must contain at least one special character
->     - [ ] Password must contain at least one upper case letter
->     - [ ] Password must contain at least one minus case letter
->     - [ ] Password must contain at least one number
->     - [ ] Max password length is 255 characters
diff --git a/.gitlab/merge_request_templates/checklist_before_merging.md b/.gitlab/merge_request_templates/checklist_before_merging.md
index eb79fb3..edd506b 100644
--- a/.gitlab/merge_request_templates/checklist_before_merging.md
+++ b/.gitlab/merge_request_templates/checklist_before_merging.md
@@ -1,13 +1,61 @@
-Please make sure your MR is ready to be merged !
+## Checklist
 
-- [ ] You added the changes in CHANGELOG.md
-- [ ] You described the MR as below
-- [ ] You updated the [HD APP wiki](https://github.com/recalbox/recalbox-os/wiki/) or the [dev wiki](https://gitlab.com/recalbox/recalbox/wikis/home)
+<!---
+Please, make sure you have changed the topic and also
+described briefly what have you done. Thanks!
+-->
 
-Fixes #XXX
+I have done ...
 
-Changes :
-- describe changes here
+- [ ] This commits targets only one specific issue
+- [ ] The commit message follows our guidelines
+- [ ] Tests for the changes have been added
+- [ ] Docs have been added or updated
+- [ ] I have assigned my architect to review this merge request
+- [ ] I have checked how to create a [merge request]()
 
-Related to :
-- link other PR or issues here
+
+## Issues
+
+<!---
+Which issue this PR closes? It can close only one issue.
+Which issues this PR references?
+Please, specify all issues.
+Format is: Closes #X or Refs #Y
+Docs: https://docs.gitlab.com/ee/user/project/issues/closing_issues.html#via-merge-request
+-->
+
+
+## Time spent
+
+<!---
+This information is only required for statistics and analysis.
+But we need to know exactly how much time you have spent,
+please try to be as accurate as possible.
+Format is: /spend 1h
+Docs: https://docs.gitlab.com/ee/workflow/time_tracking.html
+-->
+
+/spend Xh
+
+
+## Assignee
+
+<!---
+You need to assign your architect to review your merge request.
+Format: /assign @username
+Docs: https://docs.gitlab.com/ee/user/project/quick_actions.html
+-->
+
+/assign
+
+
+## Feedback
+
+<!---
+Did you encounter any other problems you want to share with us?
+Optional. Feel free to remove this section if you don't have any feedback.
+-->
+
+
+<!--- Thank you for you contribution! -->