diff --git a/.github/ISSUE_TEMPLATE/1-bug_report.md b/.github/ISSUE_TEMPLATE/1-bug_report.md
new file mode 100644
index 0000000000..41a79fd85f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-bug_report.md
@@ -0,0 +1,52 @@
+---
+name: Bug report
+about: File a bug report to help us improve future versions of privacyIDEA
+title: ''
+labels: possible bug
+assignees: ''
+
+---
+
+<!--
+Thank you for filing a bug within privacyIDEA. The more information you provide, the easier it is to identify the problem!
+
+Issues are not meant for asking questions! You're welcome to ask questions in our community forum: https://community.privacyidea.org
+
+privacyIDEA is licensed under the AGPL and comes without warranty. If you require reliable, professional help, please consider getting either
+- consultancy 
+  (https://netknights.it/en/leistungen/one-time-services/)
+- or the privacyIDEA Enterprise Edition 
+  (https://netknights.it/en/leistungen/service-level-agreements/)
+-->
+
+### Top-level intent
+
+What did you try to achieve?
+
+### Steps to reproduce
+
+1.
+2.
+3.
+
+### Expected outcome
+
+What do you think, how the system should have worked?
+
+### Actual outcome
+
+What did actually happen?
+
+### Configuration
+
+* **privacyIDEA version**:
+* **Installation method**: (from Ubuntu packages, github, PyPI, ...)
+* **Python version**:
+* **Operating system**:
+* **Webserver**:
+* **Token database**: (MySQL, PostgreSQL, ...)
+
+### Log file
+
+**Set PI_LOGLEVEL = logging.DEBUG in pi.cfg and take a look at the privacyidea.log!**
+**If appropriate, attach the log file or paste relevant portions.**
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/2-feature_request.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to .github/ISSUE_TEMPLATE/2-feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/are-you-lost-.md b/.github/ISSUE_TEMPLATE/3-are_you_lost.md
similarity index 72%
rename from .github/ISSUE_TEMPLATE/are-you-lost-.md
rename to .github/ISSUE_TEMPLATE/3-are_you_lost.md
index c0fb9849eb..01f2c72249 100644
--- a/.github/ISSUE_TEMPLATE/are-you-lost-.md
+++ b/.github/ISSUE_TEMPLATE/3-are_you_lost.md
@@ -1,15 +1,14 @@
 ---
 name: Are you lost?
-about: If you did not find a bug and do not want to suggest a new feature, you probably
-  have some questions.
+about: If you did not find a bug and do not want to suggest a new feature, you probably have some questions.
 title: ''
 labels: question
 assignees: ''
 
 ---
 
-To address general questions about the usage of privacyIDEA, we run a destinct forum, where you can discuss your problems in regards to installation, setup or configuration.
+To address general questions about the usage of privacyIDEA, we run a distinct forum, where you can discuss your problems in regards to installation, setup or configuration.
 Please go to: https://community.privacyidea.org.
 
-The github issues are not ment for such questions.
+The github issues are not meant for such questions.
 If you still think, that you encountered an issue, that needs a fix or change in the code, you are welcome to file an issue!
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 5b97305817..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,67 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: possible bug
-assignees: ''
-
----
-
-<!--
-Thank you for filing a bug within privacyIDEA.
-Please read the following blog post.
-https://www.privacyidea.org/getting-help/
-
-The more information you provide, the easier it is to identify 
-the problem!
-
-Issues are not meant for asking questions!
-If you simply wonder how things work and need some explanation 
-please visit the community forum:
-
-https://community.privacyidea.org
-
-If you do not like the NO-WARRANTY of this software and need
-reliable, professional help, please consider getting either
-- consultancy 
-  (https://netknights.it/en/leistungen/one-time-services/)
-- or the privacyIDEA Enterprise Edition 
-  (https://netknights.it/en/leistungen/service-level-agreements/)
-
-If you still think, you should open an issue, please do so:
--->
-
-# What did you try to do?
-
-Please provide your top level intent!
-Please provide steps to reproduce!
-
-# What outcome did you expect?
-
-What do you think, how the system should have worked?
-
-# What outcome did you experience?
-
-What did acutally happen?
-
-# Configuration
-
-* privacyIDEA Version:
-
-* Installation method:
-  (from source, github, virtualenv, ubuntu packages...)
-
-
-## more details: 
-
-* OS:
-
-* Webserver:
-
-* Tokendatabase: (like MySQL, PostgreSQL, ...)
-
-
-# Log file
-
-**Turn on debug level and take a look at the privacyidea.log!**
-**If appropriate, attach the log file.**