diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index e0406d2257..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Bug Report
-about: Describe an issue you encountered when playing OpenRCT2
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!--
-  Fill in the placeholders below. Delete any headings and placeholders that you do not fill in.
--->
-**OS:** [e.g. Windows 10]
-**Version:** [e.g. 0.3.4.1]
-**Commit/Build:** [e.g. 426e106]
-
-<!-- Explanation of the issue -->
-
-
-
-- [ ] Reproducible in RCT2 (vanilla)?
-- [ ] Specific to multiplayer?
-
-**Steps to reproduce:**
-1. 
-2. 
-
-**Dump file**
-<!-- If you have a dump file: .dmp.gz will be accepted directly, otherwise zip it before you drag & drop it here. -->
-
-**Screenshots / Video:**
-<!-- Drag & drop screenshots here. You can use https://youtube.com to upload video. -->
-
-**Save game:**
-<!-- Change the file extension to .txt or package to a .zip so that it can be drag & dropped here... -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 0000000000..76264b3f41
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,62 @@
+name: Bug report
+description: Report an issue you encountered when playing OpenRCT2.
+labels: 
+- bug
+
+body:
+- type: markdown
+  attributes:
+    value: Before filing this bug, [please check if it hasn't already been reported](https://github.com/OpenRCT2/OpenRCT2/issues?q=is%3Aissue+label%3Abug). If it has, please add useful information to the existing issue instead.
+
+- type: input
+  attributes:
+    label: Operating System
+    placeholder: Windows 10, 64-bit
+  validations:
+    required: true
+
+- type: input
+  attributes:
+    label: OpenRCT2 build
+    placeholder: OpenRCT2, v0.3.4.1 (d76611e on develop) provided by GitHub
+    description: You can copy the version information from the About window. Open the "Disk and game options" menu (floppy disk on the top toolbar), choose "About 'OpenRCT2'" and click the copy button next to the version information.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Describe the issue
+    description: Please describe the issue you are experiencing here.
+  validations:
+    required: true
+
+- type: dropdown
+  attributes:
+    label: Area(s) with issue?
+    description: What things had an issue? Check all that apply.
+    multiple: true
+    options:
+      - The bug also exists in RCT2 (vanilla)
+      - This bug is specific to multiplayer
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Steps to reproduce
+    description: We highly suggest including a screenshot and a bug report log (System tray->Report bug).
+    placeholder: Tell us the steps required to trigger your bug.
+    value: |
+      1. 
+      2. 
+      3. 
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Attachments
+    description: Please add any screenshots, dump files and/or videos here that may help us fix the issue.
+    placeholder: Drag and drop files here to add them
+  validations:
+    required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..d56bb91510
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+- name: Translation / Localisation
+  url: https://github.com/OpenRCT2/Localisation
+  about: For localisation issues, go to the localisation repository.
+- name: OpenRCT2 Discord Server
+  url: https://discord.gg/ZXZd8D8
+  about: For help with running or playing the game, join our Discord server.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 0000000000..6986b22216
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,29 @@
+name: Feature request
+description: Request a new feature to be added to OpenRCT2.
+labels:
+- feature
+
+body:
+- type: markdown
+  attributes:
+    value: Before filing this request, [please check if it hasn't already been suggested before](https://github.com/OpenRCT2/OpenRCT2/issues?q=is%3Aissue+label%3Afeature). If it has, please add to the existing issue instead.
+
+- type: textarea
+  attributes:
+    label: Describe the feature
+    placeholder: Describe your feature idea here. You can paste or drag & drop attachments here to help on illustrating it.
+  validations:
+    required: true
+
+- type: dropdown
+  attributes:
+    label: Feature type
+    description: What would this feature improve? Check all that apply.
+    multiple: true
+    options:
+      - Quality of life
+      - Multiplayer
+      - Plug-ins
+      - Other
+  validations:
+    required: true