diff --git a/.github/ISSUE_TEMPLATE/Bug.md b/.github/ISSUE_TEMPLATE/Bug.md
index 4147989..9166876 100644
--- a/.github/ISSUE_TEMPLATE/Bug.md
+++ b/.github/ISSUE_TEMPLATE/Bug.md
@@ -1,6 +1,10 @@
 ---
-name:  Bug Report
-about: Something is broken / doesn't work as expected
+name: Bug Report
+about: Something doesn't work (as expected)
+title: ''
+labels: ''
+assignees: ''
+
 ---
 
 ### Bug Report
@@ -8,17 +12,12 @@ about: Something is broken / doesn't work as expected
 #### Summary
 Affected module: <module name>
 
-Description:
+#### Description:
 <description>
 
-#### What is the current behaviour and what is the expected behaviour?
-
 #### How to reproduce
 <!-- Please provide steps on how to reproduce the issue (screenshots would be great) -->
 
-#### Expected behavior
-<!-- What was the expected (correct) behavior? -->
-
 <!--
 If you are having problems with fonts, please read:
 https://github.com/tobi-wan-kenobi/bumblebee-status/issues/228
@@ -29,4 +28,3 @@ https://github.com/tobi-wan-kenobi/bumblebee-status/issues/233
 Please note FontAwesome 5 is currently not supported:
 https://github.com/tobi-wan-kenobi/bumblebee-status/issues/239
 -->
-
diff --git a/.github/ISSUE_TEMPLATE/Feature.md b/.github/ISSUE_TEMPLATE/Feature.md
index fcc2335..4b795ad 100644
--- a/.github/ISSUE_TEMPLATE/Feature.md
+++ b/.github/ISSUE_TEMPLATE/Feature.md
@@ -1,6 +1,10 @@
 ---
 name: Feature Request
 about: You have a neat idea that should be implemented?
+title: ''
+labels: ''
+assignees: ''
+
 ---
 
 ### Feature Request
diff --git a/.github/ISSUE_TEMPLATE/Support.md b/.github/ISSUE_TEMPLATE/Support.md
deleted file mode 100644
index e3802f8..0000000
--- a/.github/ISSUE_TEMPLATE/Support.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: ❓ Support Question
-about: Have a problem that you can't figure out?
----
-
-<!-- Fill in the relevant information below to help triage your issue. -->
-<!--
-Note: All issues will instant closed if the issue template is not complete. Please understand that it is easier for us if you fill out the template to help you faster.
-
-!All text inside \<\!-- \--\> will be hidden from us so please remove the arrows in the statements below.
--->
-
-|    Q        |   A
-|------------ | -----
-| Version     | x
-
-
-#### Support Question
-<!-- Describe the issue you are facing here. -->
-