diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Version of OpenTTD
-
-## Expected result
-
-## Actual result
-
-## Steps to reproduce
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
new file mode 100644
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -0,0 +1,17 @@
+---
+name: Bugs
+about: Found a bug in OpenTTD?
+title: "Bug Report"
+---
+
+## Version of OpenTTD
+<!-- Indicate what version of OpenTTD you are using, including your OS. -->
+
+## Expected result
+<!-- Describe in a few words what you expected to happen. -->
+
+## Actual result
+<!-- Descibe 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/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+- name: Suggestions and ideas?
+  url: https://www.tt-forums.net/viewforum.php?f=32
+  about: Have a suggestion or an idea for a cool new feature? Post them on our forum!
diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
new file mode 100644
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/crash.md
@@ -0,0 +1,12 @@
+---
+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
+<!-- Indicate what version of OpenTTD you are using, including your OS. -->
+
+## Steps to reproduce
+<!-- Please spend a few words if you can reproduce this problem. -->