diff --git a/.github/ISSUE_TEMPLATE/found-a-bug.md b/.github/ISSUE_TEMPLATE/found-a-bug.md
index 54bc0d9..54e34f4 100644
--- a/.github/ISSUE_TEMPLATE/found-a-bug.md
+++ b/.github/ISSUE_TEMPLATE/found-a-bug.md
@@ -1,12 +1,16 @@
 ---
 name: Found a bug?
-about: Use this template if you found a bug
+about: Use this template to submit a bug report
 title: ""
 labels: bug
 assignees: ""
 ---
 
-<!-- Please use PeerTube or YouTube comments for questions and issues for bug reports. -->
+<!-- Please use discussions if you need help. -->
+
+## Branch
+
+`draft` or `master`?
 
 ## Guide
 
diff --git a/.github/ISSUE_TEMPLATE/have-a-recommendation.md b/.github/ISSUE_TEMPLATE/have-a-suggestion.md
similarity index 61%
rename from .github/ISSUE_TEMPLATE/have-a-recommendation.md
rename to .github/ISSUE_TEMPLATE/have-a-suggestion.md
index 9346e0b..e652b80 100644
--- a/.github/ISSUE_TEMPLATE/have-a-recommendation.md
+++ b/.github/ISSUE_TEMPLATE/have-a-suggestion.md
@@ -1,11 +1,13 @@
 ---
-name: Have a recommendation?
-about: Use this template if you have a recommendation
+name: Have a suggestion?
+about: Use this template to submit a suggestion
 title: ""
-labels: recommendation
+labels: suggestion
 assignees: ""
 ---
 
+<!-- Please use discussions if you need help. -->
+
 ## Branch
 
 `draft` or `master`?
@@ -20,4 +22,4 @@ assignees: ""
 
 ## Description
 
-What do you recommend?
+What do you suggest?