diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 0f7f2384ea..724e034f26 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,5 @@
-<!-- ⚠️  Please respect one of these issue templates: https://github.com/strapi/strapi/issues/new/choose -->
+<!--
 
-<!-- If the issue description is not complete or/and doesn't follow the template we will close it -->
+Please use one of these issue templates: https://github.com/strapi/strapi/issues/new/choose
+
+-->
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
index 1e70a9aac2..aaa831cd98 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -1,41 +1,41 @@
 ---
 name: 🐛 Bug Report
-about: Create a report to help us improve 🤔.
+about: Create an issue report.
 ---
 
-<!-- ⚠️ If you do not respect this template your issue will be closed. -->
+<!--
+Hello 👋 Thank you for submitting an issue.
 
-<!-- =============================================================================== -->
-<!-- ⚠️ If you are not using the current Strapi release, you will be asked to update. -->
-<!-- Please see the wiki for guides on upgrading to the latest release. -->
-<!-- =============================================================================== -->
+Before you start, please make sure your issue is understandable and reproducible.
+To me it readable please use a well markdown syntax.
 
-<!-- ⚠️ Make sure to browse the opened and closed issues before submitting your issue. -->
+https://guides.github.com/features/mastering-markdown/
+-->
 
-<!-- ⚠️ Before writing your issue make sure you are using:-->
-<!-- Node 10.x.x -->
-<!-- npm 6.x.x -->
-<!-- The latest version of Strapi. -->
+**Describe the bug**
+A clear and concise description of what the bug is.
 
-**Informations**
-- **Node.js version**: <!-- Please ensure you are using the Node LTS version (v10) -->
-- **NPM version**: 
-- **Strapi version**: <!-- Please make sure you are on the latest version -->
-- **Database**: 
-- **Operating system**: 
-- **(Optional) Link to your Project**: <!-- To speedup support, if you have your project on github/gitlab you can provide a link -->
+**Steps to reproduce the behavior**
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
 
+**Expected behavior**
+A clear and concise description of what you expected to happen.
 
-**What is the current behavior?**
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
 
+**Code snippets**
+If applicable, add code samples to help explain your problem.
 
+**System**
+- Node.js version: <!-- Please ensure you are using the Node LTS version (v10) -->
+- NPM version:
+- Strapi version: <!-- Please make sure you are on the latest version -->
+- Database:
+- Operating system:
 
-**Steps to reproduce the problem**
-
-
-
-**What is the expected behavior?**
-
-
-
-**Suggested solutions**
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
index ff714bcb8b..e14b41814b 100644
--- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
@@ -1,22 +1,15 @@
 ---
 name: 🚀 Feature Request
-about: Suggest an idea for this project 💡!
+about: Suggest an idea for Strapi!
 ---
 
-<!-- ⚠️ If you do not respect this template your issue will be closed. -->
+<!--
+Hello 👋 Thank you for submitting a feature request.
 
-<!-- ⚠️ Make sure to browse the opened and closed issues before submitting your issue. -->
+We are using ProductBoard to manage our roadmap and feature request.
 
-<!-- 
-Please also submit your idea on the Strapi Product Board:
-https://portal.productboard.com/strapi/tabs/2-under-consideration/submit-idea
-
-If your request on the product board is accepted this feature request issue will be closed,
-but will still accept public discussion.
+Can you please submit your feature request here: https://portal.productboard.com/strapi
 -->
 
-- [ ] **I have created my request on the Product Board before I submitted this issue**
-- [ ] **I have looked at all the other requests on the Product Board before I submitted this issue**
 
-**Please describe your feature request:**
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index a64c49f9a3..061ba18390 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,23 +1,32 @@
-> ⚠️ We have stopped merging PRs for now to the Strapi core.<br><br>
-> The reason is that we are developing new architecture for the admin panel and for the plugins.<br>
-> This new architecture will provide stability of the Strapi core as we approach the release of Beta.<br>
-> We appreciate and welcome all your contributions, but until further notice, please do not submit a PR as it will not be merged.<br>
-> Furthermore, you will have to rewrite it based on the new architecture.
+<!--
+⚠️ We have stopped merging PRs for now to the Strapi core.
+The reason is that we are developing new architecture for the admin panel and for the plugins.
+This new architecture will provide stability of the Strapi core as we approach the release of Beta.
+We appreciate and welcome all your contributions, but until further notice, please do not submit a PR as it will not be merged.
+Furthermore, you will have to rewrite it based on the new architecture.
+-->
 
+<!--
+Hello 👋 Thank you for submitting a pull request.
 
-<!-- ⚠️ Your PR title will appear in the changelogs please make it short detailed and understandable for all. -->
+To help us to merge you PR please follow this bullet points:
+- You write documentation
+- You write tests
+- Refer issue you close in your PR description - fix #issue
+- Let us know if this PR is WIP or ready to merge
+-->
 
-<!-- Write a short description of what your PR does and link the concerned issues of your update. -->
-<!-- ⚠️ Please link issue(s) you close / fix by using GitHub keywords https://help.github.com/articles/closing-issues-using-keywords/ !-->
-#### Description:
+#### Description of what you did:
 
 
 
-<!-- Uncomment the correct contribution type. !-->
+<!--
+Replace [ ] by [x] to check these checkboxs!
+-->
 
 #### My PR is a:
 - [ ] 💥 Breaking change
-- [ ] 🐛 Bug fix #issueNumber
+- [ ] 🐛 Bug fix
 - [ ] 💅 Enhancement
 - [ ] 🚀 New feature
 
@@ -27,7 +36,6 @@
 - [ ] Framework
 - [ ] Plugin
 
-<!-- Please note that all databases should be tested and confirmed to be working prior to the PR being merged. -->
 #### Manual testing done on the following databases:
 - [ ] Not applicable
 - [ ] MongoDB