diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
new file mode 100644
index 0000000000..1312de943a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,22 @@
+---
+name: Bug report
+about: Create a report to help Firefly III improve
+
+---
+
+**Bug description**
+I am running Firefly III version x.x.x
+
+(please give a clear and concise description of what the bug is)
+
+**Steps to reproduce**
+What do you need to do to trigger this bug?
+
+**Extra info**
+Please add extra info here, such as OS, browser, and the output from the `/debug`-page of your Firefly III installation (click the version at the bottom).
+
+**Bonus points**
+Earn bonus points by:
+
+- Post a stacktrace from your log files
+- Add a screenshot
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/Custom.md b/.github/ISSUE_TEMPLATE/Custom.md
new file mode 100644
index 0000000000..f943c935cb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Custom.md
@@ -0,0 +1,25 @@
+---
+name: I have a question or a problem
+about: Ask away
+
+---
+
+I am running Firefly III version x.x.x
+
+**Description of my issue:**
+
+
+**Steps to reproduce** 
+
+(please include if this problem also exists on the demo site: https://demo.firefly-iii.org/ )
+
+**Extra info**
+
+Please add extra info here, such as OS, browser, and the output from the `/debug`-page of your Firefly III installation (click the version at the bottom). 
+
+**Bonus points**
+Earn bonus points by:
+
+- Post a stacktrace from your log files
+- Add a screenshot
+- Post nginx or Apache configuration
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 0000000000..7dfae270ae
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea or feature for Firefly III
+
+---
+
+**Description**
+Please describe your feature request:
+
+- I would like Firefly III to do X.
+- What if you would add Y?
+
+**Solution**
+Describe what your feature would add to Firefly III.
+
+**What are alternatives?**
+Please describe what alternatives currently exist.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
\ No newline at end of file
diff --git a/.github/issue_template.md b/.github/issue_template.md
deleted file mode 100644
index d1640a0f27..0000000000
--- a/.github/issue_template.md
+++ /dev/null
@@ -1,11 +0,0 @@
-I am running Firefly III version x.x.x 
-
-#### Description of my issue:
-
-#### Steps to reproduce 
-
-(please include if this problem also exists on the demo site)
-
-#### Other important details (log files, system info):
-
-Please click the version number in the right corner of any Firefly III page to get debug information. 
\ No newline at end of file