diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index ff356b4..0171c49 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -2,7 +2,7 @@
 name: Bug Report
 about: Something not working as expected? Create a bug report to help us improve.
 title: ''
-labels: ''
+labels: ":x: bug"
 assignees: ''
 
 ---
@@ -24,24 +24,23 @@ Many issues filed here are either duplicates of existing issues or requests for
 * Search the list of existing issues. Someone may have already filed a bug report.
   (https://github.com/Microsoft/AzureStorageExplorer/issues)
 -->
-**Storage Explorer Version**: <!-- In which Storage Explorer version was the bug encountered? -->
-**Platform/OS**: <!-- Linux Ubuntu? macOS High Sierra? Windows 10? -->
-**Architecture**: <!-- i86? x64? -->
-**Regression From**: <!-- Was this working in a previous version? If so, which one? -->
+**Storage Explorer Version**: _In which Storage Explorer version was the bug encountered?_
+**Platform/OS**: _Linux Ubuntu? macOS High Sierra? Windows 10?_
+**Architecture**: _i86? x64?_
+**Regression From**: _Was this working in a previous version? If so, which one?_
 
 **Bug description**
-<!-- A clear and concise description of what the bug is. -->
+_A clear and concise description of what the bug is._
 
 **Steps to Reproduce**
-<!-- List the minimal steps clearly and concisely to reproduce the behavior: -->
-1.
-2.
+1. _List the minimal steps required to reproduce the bug._
+2. _Be as clear and concise as you can._
 
 **Expected Experience**
-<!-- A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain what you expected. -->
+_A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain what you expected._
 
 **Actual Experience**
-<!-- A clear and concise description of what actually happens. If applicable, add screenshots to help explain what actually happened. -->
+_A clear and concise description of what actually happens. If applicable, add screenshots to help explain what actually happened._
 
 **Additional Context**
-<!-- Add any other context about the problem here. -->
+_Add any other context about the problem here, such as unusual system configurations, network restrictions, etc._
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..bbcbbe7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.