diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e3eb417..55fde6d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,5 +1,5 @@
 ---
-name: 🐛 Bug report
+name: "\U0001F41B Bug report"
 about: Report a bug for this project
 title: ''
 labels: 'type: bug'
@@ -7,8 +7,8 @@ assignees: jef
 
 ---
 
-<!--- Feel free to join our discord server (https://discord.gg/gbVY4vB9JF) for general support --->
-<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
+<!--- If you have a question or idea, feel free to create a topic in https://github.com/jef/streetmerchant/discussions --->
+<!--- Feel free to join our Discord server (https://discord.gg/gbVY4vB9JF) for addition support --->
 
 ## Expected Behavior
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index d492f8e..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: 🚀 Feature request
-about: Suggest a feature for this project
-title: ''
-labels: 'type: enhancement'
-assignees: jef
-
----
-
-## Description
-
-<!-- Describe the feature here -->
-
-## Possible solution
-
-<!-- Describe the possible solution here -->
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index 727368c..0000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: 🤔 Question
-about: Open to all questions
-title: ''
-labels: 'type: question'
-assignees: jef
-
----
-
-## Description
-
-<!-- Describe the question here -->