diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 0000000..5bf27f1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,20 @@
+---
+name: Bug Report
+about: Create a Bug Report
+
+---
+
+**Description**
+What seems to be the problem?
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Extension Version**
+What version of the XML Tools extension are you using?
+
+**VS Code Version**
+What version of VS Code are you using?
+
+**Operating System**
+What OS (and version) are you using?
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..bb21a36
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,20 @@
+---
+name: Bug report
+about: Create a Bug Report
+
+---
+
+**Description**
+What seems to be the problem?
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Extension Version**
+What version of the XML Tools extension are you using?
+
+**VS Code Version**
+What version of VS Code are you using?
+
+**Operating System**
+What OS (and version) are you using?
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 0000000..02afe90
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,11 @@
+---
+name: Feature Request
+about: Suggest a New Feature
+
+---
+
+**Description**
+What would you like to see added to XML Tools?
+
+**Current Workarounds**
+Are you using a workaround in the meantime?