diff --git a/.github/ISSUE_TEMPLATE/20-documentation-issue.md b/.github/ISSUE_TEMPLATE/20-documentation-issue.md
index c4ef3fd74..27bfc9cff 100644
--- a/.github/ISSUE_TEMPLATE/20-documentation-issue.md
+++ b/.github/ISSUE_TEMPLATE/20-documentation-issue.md
@@ -16,7 +16,9 @@ All done? Then please fill the following mandatory form to help us triage your i
 
 **Parts of the documentation concerned:**
 
+<!--
 Please provide a link to the documentation entry, for example: https://docs.joinpeertube.org/#/install-any-os
+-->
 
 **Describe the desired information/correction**
 
diff --git a/.github/ISSUE_TEMPLATE/30-feature-request.md b/.github/ISSUE_TEMPLATE/30-feature-request.md
index 675733ea5..bb2cf20aa 100644
--- a/.github/ISSUE_TEMPLATE/30-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/30-feature-request.md
@@ -1,7 +1,6 @@
 ---
 name: ✨ Feature Request
 about: Use this template to ask for new features and suggest new ideas 💡
-labels: 'Type: Discussion :thought_balloon:'
 ---
 
 <!--
@@ -12,9 +11,9 @@ Please search among past open/closed issues for a similar one beforehand:
 All done? Then please fill the following mandatory form to help us triage your request.
 -->
 
-**Is your request related to a problem?** <!-- optional -->
+**Describe the problem to be solved**
 
-<!-- Remove the question when answering or if not relevant.
+<!--
   Provide a clear and concise description of what the problem is.
   Ex. I have an issue when [...]
 -->
@@ -30,10 +29,3 @@ All done? Then please fill the following mandatory form to help us triage your r
 <!-- Remove if you have not considered alternatives.
   Let us know about other solutions you have tried or researched.
 -->
-
-**Additional context** <!-- optional -->
-
-<!-- Remove if not applicable.
-  Is there anything else you can add about the proposal?
-  You might want to link to related issues here if you haven't already.
--->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 517d318b1..a49db848f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,22 +1,15 @@
 ## Description
+
 <!-- Please include a summary of the change, with motivation and context -->
 
 ## Related issues
-<!--- If suggesting a new feature or change, please discuss it in an issue first -->
-<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
+
+<!-- If suggesting a new feature or change, please discuss it in an issue first -->
+<!-- If fixing a bug, there should be an issue describing it with steps to reproduce -->
 <!-- start with closing keywords if any apply: https://docs.github.com/en/enterprise/2.16/user/github/managing-your-work-on-github/closing-issues-using-keywords -->
 
-## Type of change
-<!--- Put an `x` in all the boxes that apply: -->
-- [ ] ♻️ Refactor discussed in #
-- [ ] ✨ Feature as discussed in #
-- [ ] 🐛 Bug Fix
-- [ ] 👷 Optimization/Maintenance
-- [ ] 📝 Documentation Update
-- [ ] 🔖 Release
-- [ ] 🚩 Other
-
 ## Has this been tested?
+
 <!--- Put an `x` in the box that applies: -->
 - [ ] 👍 yes, I added tests to the test suite
 - [ ] 👍 yes, light tests as follows are enough
@@ -32,22 +25,6 @@ Provide instructions so we can reproduce.
 Please also list any relevant details for your test configuration(s):
 -->
 
-**Self-test configuration**:
-* NodeJS version: <!-- if PR change dependencies -->
-* Viewport sizes: <!-- if PR changes UI -->
-* Browser name/version: <!-- if PR changes UI -->
-
 ## Screenshots
-<!-- delete if not relevant -->
 
-## Checklist:
-<!-- delete unrelevant entries -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-<!--- Put an `x` in all the boxes that apply: -->
-- [ ] I have read the [CONTRIBUTING](./.github/CONTRIBUTING.md) documentation.
-- [ ] I didn't make the linter cry
-- [ ] I have commented my code, particularly in hard-to-understand areas
-- [ ] I have made changes to the documentation as needed
-- [ ] I have made changes to the OpenAPI spec as needed
-- [ ] To the best of my knowledge, my changes introduce no known security vulnerability
-- [ ] I have corrected any misspellings in my code/comments
+<!-- delete if not relevant -->