diff --git a/.github/ISSUE_TEMPLATE/communication-issue-with-an-external-camera-or-software.md b/.github/ISSUE_TEMPLATE/bug-external.md
similarity index 69%
rename from .github/ISSUE_TEMPLATE/communication-issue-with-an-external-camera-or-software.md
rename to .github/ISSUE_TEMPLATE/bug-external.md
index 676e96a1..1b7072b0 100644
--- a/.github/ISSUE_TEMPLATE/communication-issue-with-an-external-camera-or-software.md
+++ b/.github/ISSUE_TEMPLATE/bug-external.md
@@ -1,7 +1,6 @@
 ---
-name: Communication issue with an external camera or software
-about: Some bugs are caused by different RTSP implementations between the
-  server and the target
+name: 'Bug: communication with an external camera or another software'
+about: Bug that arised when using the software with an external camera or another software
 title: ''
 labels: ''
 assignees: ''
@@ -9,7 +8,7 @@ assignees: ''
 ---
 
 <!--
-The most helpful content you can provide to fix a communication issue between rtsp-simple-server and an external hardware or software, is a network dump of the data exchanged between the server and the target, that can be generated in this way:
+The most helpful content you can provide to fix a communication issue between rtsp-simple-server and an external hardware or software, is a dump of the data exchanged between the server and the target (network dump), that can be generated in this way:
 1) Download wireshark (https://www.wireshark.org/)
 2) Start capturing on the interface used for exchanging RTSP (if the server and the target software are both installed in your pc, the interface is probably "loopback", otherwise it's the one of your network card)
 3) Start the server and replicate the issue
@@ -27,4 +26,4 @@ Description
 
 ## Did you attach a network dump?
 
-yes
+yes / no
diff --git a/.github/ISSUE_TEMPLATE/blank-issue.md b/.github/ISSUE_TEMPLATE/bug-generic.md
similarity index 54%
rename from .github/ISSUE_TEMPLATE/blank-issue.md
rename to .github/ISSUE_TEMPLATE/bug-generic.md
index f9efc1c6..fe808dde 100644
--- a/.github/ISSUE_TEMPLATE/blank-issue.md
+++ b/.github/ISSUE_TEMPLATE/bug-generic.md
@@ -1,6 +1,6 @@
 ---
-name: Blank issue, question or enhancement request
-about: Blank issue, question or enhancement request
+name: 'Bug: generic'
+about: Generic bug
 title: ''
 labels: ''
 assignees: ''
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
new file mode 100644
index 00000000..634e04c5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -0,0 +1,16 @@
+---
+name: Enhancement request
+about: Enhancement request
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Which version are you using?
+
+v0.0.0
+
+## Enhancement request
+
+Description
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000..add65c69
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,16 @@
+---
+name: Question
+about: Question
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Which version are you using?
+
+v0.0.0
+
+## Question
+
+Description