diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 106cbe55b3..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-👋 Hi there! Thanks for taking the time to open an issue.
-ׁ
-Here's a guide to getting your issue resolved quickly:
-
-❓ Did you check that you're on the latest version of Preact?
-🗣 For help with Preact, ask on discussions: https://github.com/preactjs/preact/discussions
-✨ Check for existing StackOverflow solutions: https://stackoverflow.com/search?q=preact
-📚 Check out our docs - for Preact 10: https://preactjs.com/guide/v10/getting-started
-🔎 Check if there's already an issue for your problem
-🛠 If your issue relates to preact-cli, please file at https://github.com/preactjs/preact-cli
-📑 For documentation or website issues, please file at https://github.com/preactjs/preact-www
--->
-
-### Reproduction
-
-<!--
-If possible, please provide a CodeSandbox/Codepen that demonstrates the issue.
-ׁ
-Otherwise, we'll need the versions of Preact and related libraries you're using.
-For npm, copy & paste the output of this terminal command:
-  npm ls --depth 0 | grep preact
-You can use the following template: https://codesandbox.io/s/preact-x-preact-cli-3-starter-vj285y2rn3
--->
-
-### Steps to reproduce
-
-<!--
-It's sometimes difficult to understand what's happening in demos.
-List steps to take helps clarify - click this button, wait 5 seconds, etc.
--->
-
-### Expected Behavior
-
-<!-- What should have happened when following the steps above? -->
-
-### Actual Behavior
-
-<!-- Here's what actually happened 😲 -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..82758df9a0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,25 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+- [ ] Check if updating to the latest Preact version resolve the issue
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+
+If possible, please provide a CodeSandbox/Codepen that demonstrates the issue. You can use the following template: https://codesandbox.io/s/preact-x-preact-cli-3-starter-vj285y2rn3
+
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. See error
+
+**Expected behavior**
+What should have happened when following the steps above?
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..b28962504f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature request
+assignees: ''
+
+---
+
+**Describe the feature you'd love to see**
+A clear and concise description of what you'd love to see added to Preact.
+
+**Additional context (optional)**
+Add any other context or screenshots about the feature request here.