diff --git a/.github/ISSUE_TEMPLATE/issue-template.md b/.github/ISSUE_TEMPLATE/issue-template.md
new file mode 100644
index 0000000..f9a8f47
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue-template.md
@@ -0,0 +1,19 @@
+---
+name: Issue
+about: Reporting bugs and problems in Eclipse Jetty
+title: ''
+assignees: ''
+
+---
+
+**Jetty version:**
+
+**OS version:**
+
+**Java version:**
+
+**Description:**
+
+**Steps to reproduce:**
+
+
diff --git a/.github/ISSUE_TEMPLATE/question-template.md b/.github/ISSUE_TEMPLATE/question-template.md
new file mode 100644
index 0000000..1df3218
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question-template.md
@@ -0,0 +1,18 @@
+---
+name: Question
+about: Asking questions about Eclipse Jetty
+title: ''
+labels: Question
+assignees: ''
+
+---
+
+**Jetty version:**
+
+**OS version:**
+
+**Java version:**
+
+**Question:**
+
+