diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 0000000..92e9c23
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: ''
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**OS Version**:
+**Node.js version**:
+**NPM version**:
+
+**Issue**
+describe the issue and what task you were running (update, install)
+
+**Installation logfile**
+```
+copy and paste the output from xo-install.log (by default)
+```
+**xo-server.service log**
+```
+copy and paste the output (if available) from command journalctl -u xo-server -n 100
+```
diff --git a/.github/ISSUE_TEMPLATE/issue.md b/.github/ISSUE_TEMPLATE/issue.md
new file mode 100644
index 0000000..ea67b67
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue.md
@@ -0,0 +1,24 @@
+---
+name: issue
+about: report a bug
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**OS Version**:
+**Node.js version**:
+**NPM version**:
+
+**Issue**
+describe the issue and what task you were running (update, install)
+
+**Installation logfile**
+```
+copy and paste the output from xo-install.log (by default)
+```
+**xo-server.service log**
+```
+copy and paste the output (if available) from command journalctl -u xo-server -n 100
+```