diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index aec5b59..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Please make sure that you provide enough information so that we understand what your issue is about.
-
-0. Did you check the documentation in ~/doc/ or, if it is a different problem: Did you google for it?
-
-1. uname -a
-   
-2. testssl version from the banner: testssl.sh -b 2>/dev/null | head -4 | tail -2
-
-3. git log | head -1 (if running from git repo)
-
-4. openssl version used by testssl.sh: testssl.sh -b 2>/dev/null | awk -F':' '/openssl/ { print $2}'
-
-5. steps to reproduce: testssl.sh or docker command line, if possible incl. host
-
-6. what exactly was happening, output is needed
-
-7. what did you expect instead?
-
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..3ea885a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG / possible BUG]"
+labels: ''
+assignees: ''
+
+---
+
+_**Please don't remove this template. We would like to reproduce the bug and need concise information. **_
+
+
+**Command line / docker command to reproduce**
+In addition the target of your scan would be helpful. If you don't want to disclose it publicly: ``grep SWCONTACT testssl.sh``.
+
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+
+**Your system (please complete the following information):**
+ - OS: ``awk -F\" '/PRETTY_NAME/ { print $2 }' /etc/os-release``
+ - Platform: ``uname -srm``
+ - Version: ``testssl.sh -b 2>/dev/null | head -4 | tail -2``
+ - Version if running from git repo: ``git log | head -1``
+ - OpenSSL: ``testssl.sh -b 2>/dev/null | awk -F':' '/openssl/ { print $2}'``
+ 
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..750bbb4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,27 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[Feature request]"
+labels: ''
+assignees: ''
+
+---
+
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[Feature Request]"
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+``
diff --git a/.github/ISSUE_TEMPLATE/other-issues---question.md b/.github/ISSUE_TEMPLATE/other-issues---question.md
new file mode 100644
index 0000000..898c032
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other-issues---question.md
@@ -0,0 +1,10 @@
+---
+name: Other issues / Question
+about: Anything else which is not covered by a bug report or feature request
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+