diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 139c4bbcb..50e90f1f2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug Report
 about: Report problems and unexpected behavior.
 title: ''
-labels: ''
+labels: 'bug'
 assignees: ''
 ---
 
@@ -12,7 +12,11 @@ assignees: ''
 - `code-server` version: <!-- The version of code-server -->
 - OS Version: <!-- OS version, cloud provider,  -->
 
-#### Steps to Reproduce
+## Description
 
-1.
-2.
+<!-- Describes the problem here -->
+
+## Steps to Reproduce
+
+1. <!-- step 1: click ... -->
+1. <!-- step 2: ... -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/extension_bug.md b/.github/ISSUE_TEMPLATE/extension_bug.md
index 09e5c47f9..7c30b9479 100644
--- a/.github/ISSUE_TEMPLATE/extension_bug.md
+++ b/.github/ISSUE_TEMPLATE/extension_bug.md
@@ -12,7 +12,11 @@ assignees: ''
 - OS Version: <!-- OS version, cloud provider,  -->
 - Extension: <!-- Link to extension -->
 
-#### Steps to Reproduce
+## Description
 
-1.
-2.
+<!-- Describes the problem here -->
+
+## Steps to Reproduce
+
+1. <!-- step 1: click ... -->
+1. <!-- step 2: ... -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 47b7dbd36..b33f67bc7 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature Request
 about: Suggest an idea for this project.
 title: ''
-labels: ''
+labels: 'feature'
 assignees: ''
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 119c6b690..3c234cd1c 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -2,16 +2,16 @@
 name: Question
 about: Ask a question.
 title: ''
-labels: ''
+labels: 'question'
 assignees: ''
 ---
 
 <!-- Please search existing issues to avoid creating duplicates. -->
 
-#### Description
+## Description
 
 <!-- A description of the the question. -->
 
-#### Related Issues
+## Related Issues
 
 <!-- Any issues related to your question. -->
\ No newline at end of file