diff --git a/.github/ISSUE_TEMPLATE/Bug.md b/.github/ISSUE_TEMPLATE/Bug.md
new file mode 100644
index 000000000..caedf4f5d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug.md
@@ -0,0 +1,28 @@
+<!--
+Thanks for taking the time to file an issue! The Mailspring community uses GitHub issues to coordinate development.
+
+Before submitting this form, try searching for both open and closed issues here: https://github.com/Foundry376/Mailspring/issues?q=is%3Aissue. Upvoting an existing issue is MUCH better than submitting a new one - it often takes a while for them to be merged and we use issue upvotes to prioritize development. -->
+
+##### What behavior are you seeing?
+
+...
+
+##### What operating system are you using?
+
+...
+
+##### What version of Mailspring are you using?
+
+(eg: 1.6.3 or 1.7.0 - this is shown in Mailspring's main menu.)
+
+--
+
+##### Is the issue related to a specific email provider (Gmail, Exchange, etc.)?
+
+...
+
+##### Is the issue reproducible with a particular attachment, message, signature, etc?
+
+<!-- Try to provide an example as a file attachment or a screenshot. -->
+
+...
diff --git a/.github/ISSUE_TEMPLATE/Feature Request.md b/.github/ISSUE_TEMPLATE/Feature Request.md
new file mode 100644
index 000000000..4a2030ced
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature Request.md	
@@ -0,0 +1,16 @@
+<!--
+Thanks for taking the time to file a feature request!
+-->
+
+##### Describe your feature request:
+
+##### Does this feature exist in another mail client or tool you use?
+
+##### Are there any related feature requests?
+
+<!-- Try searching for both open and closed issues here: https://github.com/Foundry376/Mailspring/issues?q=is%3Aenhancement. Keep in mind that email features are often described differently on different platforms. (Conversations == threads, shortcuts == hotkeys, etc)
+
+Upvoting an existing feature request is MUCH better than submitting a new one - it often takes a while for them to be merged and we use issue upvotes to prioritize development!
+ -->
+
+##### Is the request related to a specific email provider (Gmail, Exchange, etc.)?
diff --git a/.github/ISSUE_TEMPLATE/Sync Issue.md b/.github/ISSUE_TEMPLATE/Sync Issue.md
new file mode 100644
index 000000000..2c6b73c97
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Sync Issue.md	
@@ -0,0 +1,19 @@
+<!--
+Thanks for taking the time to file an issue! The Mailspring community uses GitHub issues to coordinate development.
+
+Before filling out this form, try searching for both open and closed issues here: https://github.com/Foundry376/Mailspring/issues?q=is%3Aenhancement. Upvoting an existing sync issue is MUCH better than submitting a new one - it often takes a while for them to be merged and we use issue upvotes to prioritize development.
+-->
+
+##### What is the behavior you're seeing?
+
+##### What operating system are you using?
+
+##### What version of Mailspring are you using?
+
+(eg: 1.6.3 or 1.7.0 - this is shown in Mailspring's main menu.)
+
+##### What email provider (Gmail, Exchange, etc.) are you trying to use?
+
+##### Are you able to connect your email account or does Mailspring fail to set up the account completely?
+
+##### Is the issue reproducible with a particular attachment, message, signature, etc?
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..341f165a5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Mailspring Knowledge Base
+    url: https://support.getmailspring.com
+    about: If you're curious about how to use Mailspring or looking for instructions, you may find what you need in our knowledge base!
diff --git a/.github/issue_label_bot.yaml b/.github/issue_label_bot.yaml
new file mode 100644
index 000000000..b64222622
--- /dev/null
+++ b/.github/issue_label_bot.yaml
@@ -0,0 +1,4 @@
+label-alias:
+  bug: 'bug'
+  feature_request: 'enhancement'
+  question: 'question'
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 71635c465..000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-Thanks for taking the time to file an issue! The Mailspring community uses GitHub issues to coordinate development.
-
-If you have question about Mailspring or a problem with your email account, search the Knowledge Base to see if it's addressed there. If it's not, join our Slack organization and ask the community:
-
-  - http://support.getmailspring.com/hc/en-us/
-  - https://join-mailspring-slack.herokuapp.com/
-
-Our team tries to respond to all GitHub issues. To make sure your issue is actionable, try to include the following information:
--->
-
-##### Are there any related issues?
-
-<!-- Try searching for both open and closed issues here: https://github.com/Foundry376/Mailspring/issues?q=is%3Aissue. Keep in mind that email features are often described differently on different platforms. (Conversations == threads, shortcuts == hotkeys, etc.) -->
-
-...
-
-##### What operating system are you using?
-
-...
-
-##### What version of Mailspring are you using?
-(eg: 1.6.3 or 1.7.0 - this is shown in Mailspring's main menu.)
-
---
-
-**Bug?**
-
-##### Is this an email sync or connection issue?
-
-<!-- If you're having trouble syncing an account, please zip and attach Mailspring's sync
-logs to your issue. From the app's menu, choose Developer > Show Mailsync Logs.
-The mailsync-**.log files contain very little PII and lots of debug info! -->
-
-...
-
-##### Is the issue related to a specific email provider (Gmail, Exchange, etc.)?
-
-...
-
-##### Is the issue reproducible with a particular attachment, message, signature, etc?
-
-<!-- Try to provide an example as a file attachment or a screenshot. -->
-
-...
-
---
-
-**Feature Request?**
-
-##### Does this feature exist in another mail client or tool you use?
-
-...