diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index ed2e1c33f..5375827be 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug report
-about: Report a bug in MSTest.
-labels: 'bug'
+about: Create a bug report to help us improve MSTest
+labels: [bug, need-triage]
 ---
 
 ## Describe the bug
@@ -30,4 +30,4 @@ Note that we would be glad if you could enclose a repro (zip or link to some Git
 
 <!--
 Add any other context about the problem here. 
--->
\ No newline at end of file
+-->
diff --git a/.github/ISSUE_TEMPLATE/feature-suggestion.md b/.github/ISSUE_TEMPLATE/feature-request.md
similarity index 72%
rename from .github/ISSUE_TEMPLATE/feature-suggestion.md
rename to .github/ISSUE_TEMPLATE/feature-request.md
index f56670cba..53121833f 100644
--- a/.github/ISSUE_TEMPLATE/feature-suggestion.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,8 +1,7 @@
 ---
-name: MSTest feature suggestion
-about: Suggest a new feature
-title: ''
-labels: [feature-request]
+name: Feature request
+about: Suggest a new feature/idea for MSTest
+labels: [feature-request, need-triage]
 ---
 
 ## Summary
@@ -14,7 +13,7 @@ Brief summary of what this proposal is about.
 ## Background and Motivation
 
 <!--
-What is the problem we are solving and in what context did you encounter it?
+What is the problem you are solving and in what context did you encounter it?
 -->
 
 ## Proposed Feature
@@ -28,4 +27,4 @@ Please provide a sketch of the feature you are proposing. Be as specific as you
 <!--
 Were there other options you considered?
 How does this compare to features in other editors?
--->
\ No newline at end of file
+-->
diff --git a/.github/ISSUE_TEMPLATE/other-issue.md b/.github/ISSUE_TEMPLATE/other-issue.md
new file mode 100644
index 000000000..ad0b8209a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other-issue.md
@@ -0,0 +1,7 @@
+---
+name: Other issue
+about: Open an issue which does not belong to any categories above
+labels: [need-triage]
+---
+
+<!-- Please, provide a clear and concise description of what the problem is below. -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/rfc.md b/.github/ISSUE_TEMPLATE/rfc.md
index acefe184b..3e11e99a6 100644
--- a/.github/ISSUE_TEMPLATE/rfc.md
+++ b/.github/ISSUE_TEMPLATE/rfc.md
@@ -2,7 +2,7 @@
 name: MSTest RFC
 about: Request for Comments
 title: ''
-labels: []
+labels: [rfc, need-triage]
 ---
 
 # RFC NNN - (Fill me in with a feature name)