diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..37ba447b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+I confirm (by marking "x" in the [ ] below: [x]):
+
+- [ ] This is not a troubleshooting question. [Troubleshooting questions go here: http://www.mattermost.org/troubleshoot/](http://www.mattermost.org/troubleshoot/).
+- [ ] This doesn't reproduce on web browsers (such as in Chrome). If it does, [issue reports go to the Mattermost Server repository](https://github.com/mattermost/platform/issues).
+- [ ] I have read [contributing guidelines](https://github.com/mattermost/desktop/blob/master/CONTRIBUTING.md).
+
+---
+
+**Summary**
+<!--
+Issue in one concise sentence.
+-->
+
+**Environment**
+- Operating System:
+- Mattermost Desktop App version: X.X.X <!-- See [Help] > [Version Number] -->
+- Mattermost Server version: X.X.X <!-- See [Mattermost Menu] > [About Mattermost], where [Mattermost Menu] can be accessed by clicking on three dots next to your profile picture -->
+
+**Steps to reproduce**
+1. Do ...
+2. Then, ...
+
+**Expected behavior**
+
+**Observed behavior**
+
+<!--
+Please include relevant error messages and/or screenshots.
+-->
+
+**Possible fixes**
+
+<!--
+If you can, link to the line of code that might be responsible for the problem.
+-->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..7113da8e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,16 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+<!--
+Would you like to contribute this in the feature idea forum so it can be discussed, upvoted and considered for a ticket accepting pull requests?
+
+- https://mattermost.uservoice.com/forums/306457-general/
+- https://docs.mattermost.com/process/accepting-pull-request.html
+
+Please include a link back to this GitHub Issue. If you're interested in implementing, please say so and we'll prioritize the review.
+
+You get 10 votes in the feature idea forum, and each one influences the future of the project.
+-->
diff --git a/.github/ISSUE_TEMPLATE/troubleshooting-question.md b/.github/ISSUE_TEMPLATE/troubleshooting-question.md
new file mode 100644
index 00000000..ba64fe9b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/troubleshooting-question.md
@@ -0,0 +1,9 @@
+---
+name: Troubleshooting question
+about: Ask a question about your problem
+
+---
+
+<!--
+Please see https://www.mattermost.org/troubleshoot/
+-->