diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 6ed9129c68..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,4 +0,0 @@
-<!--
- Thanks for submitting an issue to AssemblyScript! Please take a moment to
- read the contributing guidelines linked below to get off to a good start 🙂
--->
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 0000000000..9919f1b62f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,33 @@
+name: Bug Report
+description: Encountered an issue? File a bug report!
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report! To get off to a good start, make sure to:
+        * Search if there is an existing issue on the topic
+        * Get familiar with the [contributing guidelines](https://github.com/AssemblyScript/assemblyscript/blob/main/CONTRIBUTING.md)
+  - type: textarea
+    id: description
+    attributes:
+      label: Bug description
+      description: What happened? What was the expected behavior?
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Steps to reproduce
+      description: |
+        How can the issue be reproduced? A minimum example is best. Tip: Use [code blocks](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks).
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: AssemblyScript version
+      description: "What's the AssemblyScript version used?"
+      placeholder: "vX.Y.Z"
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 0000000000..15fa469b9c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,18 @@
+name: Feature suggestion
+description: Got a neat idea? File a feature suggestion!
+labels: [enhancement]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature suggestion! To get off to a good start, make sure to:
+        * Search if there is an existing issue on the topic
+        * See if the feature is mentioned at [implementation status](https://www.assemblyscript.org/status.html)
+        * Get familiar with the [contributing guidelines](https://github.com/AssemblyScript/assemblyscript/blob/main/CONTRIBUTING.md)
+  - type: textarea
+    id: description
+    attributes:
+      label: Feature suggestion
+      description: Please describe the feature you'd like to suggest.
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
new file mode 100644
index 0000000000..9975feabe7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -0,0 +1,17 @@
+name: Ask a question
+description: Wondering how to achieve something specific? Ask a question!
+labels: [question]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        To get off to a good start, make sure to:
+        * Consider asking questions on our [community Discord](https://discord.gg/assemblyscript) instead
+        * Search if there is an existing issue on the topic
+  - type: textarea
+    id: description
+    attributes:
+      label: Question
+      description: What would you like to know?
+    validations:
+      required: true
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d82a076732..5abd484e8b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,7 +2,9 @@
  Thanks for submitting a pull request to AssemblyScript! Please take a moment to
  review the contributing guidelines linked below, and confirm with an [x] 🙂
 -->
+Fixes # .
 
+Changes proposed in this pull request:
 ⯈
 ⯈
 ⯈