diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
deleted file mode 100644
index 4801435901..0000000000
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: Bugs
-about: Found a bug in OpenTTD?
-title: "Bug Report"
----
-
-## Version of OpenTTD
-<!-- Fill in below what version of OpenTTD you are using, including your OS. -->
-
-## Expected result
-<!-- Describe in a few words what you expected to happen. -->
-
-## Actual result
-<!-- Describe in a few words what actually happens. -->
-
-## Steps to reproduce
-<!-- As detailed as possible, please tell us how we can reproduce this. Feel free to attach a savegame (zip it first) to make it more clear. -->
diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
new file mode 100644
index 0000000000..39168fe5f4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -0,0 +1,41 @@
+name: Bug Report
+description: Found a bug in OpenTTD?
+title: "[Bug]: "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: input
+    id: version
+    attributes:
+      label: Version of OpenTTD
+      description: Fill in below what version of OpenTTD you are using, including your OS.
+      placeholder: ex. 1.11.2, Windows 10
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected result
+      description: Describe in a few words what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual result
+      description: Describe in a few words what actually happens.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce
+      description: As detailed as possible, please tell us how we can reproduce this. Feel free to attach a savegame (zip it first) to make it more clear.
+      placeholder: |
+        1. Loaded the attached savegame.
+        2. Click on the button left of that other icon.
+        3. The window doesn't open.
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
deleted file mode 100644
index 00f62f05c9..0000000000
--- a/.github/ISSUE_TEMPLATE/crash.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: Crash
-about: Did OpenTTD crash?
-title: "Crash Report"
----
-<!-- Please zip the crash.log, crash.dmp and crash.sav and attach it to this crash report. -->
-
-## Version of OpenTTD
-<!-- Fill in below what version of OpenTTD you are using, including your OS. -->
-
-## Steps to reproduce
-<!-- Please spend a few words if you can reproduce this problem. -->
diff --git a/.github/ISSUE_TEMPLATE/crash.yaml b/.github/ISSUE_TEMPLATE/crash.yaml
new file mode 100644
index 0000000000..b5b6531105
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/crash.yaml
@@ -0,0 +1,37 @@
+name: Crash
+description: Did OpenTTD crash?
+title: "[Crash]: "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this crash report!
+  - type: input
+    id: version
+    attributes:
+      label: Version of OpenTTD
+      description: Fill in below what version of OpenTTD you are using, including your OS.
+      placeholder: ex. 1.11.2, Windows 10
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce
+      description: Please spend a few words if you can reproduce this problem.
+      placeholder: |
+        1. Bought a new train.
+        2. The game crashed.
+    validations:
+      required: true
+  - type: textarea
+    id: crashlogs
+    attributes:
+      label: Upload crash files
+      description: With the `crash.log`, `crash.dmp`, and `crash.sav` we can analyze the crash in detail; this way you allow us to easier triage and fix the problem.
+      placeholder: |
+        1. Zip the `crash.log`, `crash.dmp` and `crash.sav`.
+        2. Click on this field.
+        3. Drag and drop the zip file in here.
+    validations:
+      required: true