diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index eed755e1a2..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,25 +0,0 @@
-__Have you searched for similar issues before submitting this one?__
-
-__Is this a bug, question or feature request?__
-
-__Describe the issue you encountered:__
-
-__Current WordPress version?__
-
-__Current ElasticPress version?__
-
-__Current Elasticsearch version?__
-
-__Where do you host your Elasticsearch server?__
-
-__What ElasticPress features do you have currently active?__
-
-__Other plugins installed (WooCommerce, Simple Redirect Manager, etc..)?__
-
-__Steps to reproduce:__
-
-1.
-2.
-3.
-
-__Screenshots, if needed:__
diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md
new file mode 100644
index 0000000000..aeb219953a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.md
@@ -0,0 +1,46 @@
+---
+name: "\U0001F41B Bug report"
+about: Create a report to help us improve
+title: 'BUG: '
+labels: bug
+assignees: ''
+
+---
+
+<!-- Thank you for reporting a possible bug.  Please fill in as much of the template below as you can. -->
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**Steps to Reproduce**
+<!-- Steps to reproduce the behavior. -->
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Screenshots**
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+**Environment information**
+ - Device: <!-- [e.g. MacBook] -->
+ - OS: <!-- [e.g. MacOS 10.14.3] -->
+ - Browser and version: <!-- [e.g. Firefox 65.0.1, Chrome 73.0.3683.75, Safari 12.0.3] -->
+ - WordPress version: <!-- [e.g., 5.3.2] -->
+ <!-- If your WordPress version is below 5.2, then please fill out the Plugins and Themes items below. -->
+ - ElasticPress version: <!-- [e.g. 3.5.6] -->
+ - Elasticsearch version: <!-- [e.g. 7.9] -->
+ - Where do you host your Elasticsearch server? <!-- [e.g. elasticpress.io] -->
+ - What ElasticPress features do you have currently active? <!-- [e.g. Post Search, Autosuggest, WooCommerce, Documents, Users, Protected Content, Related Posts, Facets, Terms, Custom Search Results] -->
+ - Plugins and version: <!-- [e.g. PluginA 1.0.0, PluginB 2.1.0, PluginC 3.2.1] -->
+ - Theme and version: <!-- [e.g. Twenty Nineteen 1.3] -->
+ <!-- If your WordPress version is 5.2 or higher, then please fill out the Site Health Info details below. -->
+ - <details><summary>Site Health Info:</summary>
+   <!-- Go to Tools > Site Health > Info tab, click "Copy site info to clipboard", and paste those details here. -->
+   </details>
+
+**Additional context**
+<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/2-enhancement.md b/.github/ISSUE_TEMPLATE/2-enhancement.md
new file mode 100644
index 0000000000..c1fcf97c84
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-enhancement.md
@@ -0,0 +1,25 @@
+---
+name: "\U0001F680 Enhancement"
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+<!-- Thank you for suggesting an idea to make things better.  Please fill in as much of the template below as you can. -->
+
+**Is your enhancement related to a problem? Please describe.**
+<!-- Please describe the problem you are trying to solve. -->
+
+**Describe the solution you'd like**
+<!-- Please describe the desired behavior. -->
+
+**Designs**
+<!-- If applicable, add mockups/screenshots/etc. to help explain your solution. -->
+
+**Describe alternatives you've considered**
+<!-- Please describe alternative solutions or features you have considered. -->
+
+**Additional context**
+<!-- Add any other context about the enhancement here. -->
diff --git a/.github/ISSUE_TEMPLATE/3-help.md b/.github/ISSUE_TEMPLATE/3-help.md
new file mode 100644
index 0000000000..5b5853e583
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3-help.md
@@ -0,0 +1,13 @@
+---
+name: "❓ Need help?"
+about: Ask us a question, we're here to help!
+title: 'QUESTION: '
+labels: question
+assignees: ''
+
+---
+
+<!-- If you have a question that is neither a bug report nor an enhancement, then please post it here!  Please fill in as much of the template below as you can. -->
+
+**Describe your question**
+<!-- A clear and concise description of what your question is. -->