diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index da2d5276..c8b07622 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,6 +1,6 @@
 ---
-name: 'Bug'
-about: Bug
+name: Bug
+about: Report a bug
 title: ''
 labels: ''
 assignees: ''
@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 <!--
-To increase the probability of your issue getting fixed, open an issue FOR EACH problem. Please do not report multiple problems in a single issue, otherwise they'll probably never get ALL fixed.
+To increase the chance of your issue getting fixed, open an issue FOR EACH problem. Please do not report multiple problems in a single issue, otherwise they'll probably never get ALL fixed.
 -->
 
 ## Which version are you using?
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..667ba994
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,10 @@
+blank_issues_enabled: false
+
+contact_links:
+  - name: Feature Request
+    url: https://github.com/aler9/rtsp-simple-server/discussions/new
+    about: Share ideas for new features
+
+  - name: Question
+    url: https://github.com/aler9/rtsp-simple-server/discussions/new
+    about: Ask the community for help
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
deleted file mode 100644
index 634e04c5..00000000
--- a/.github/ISSUE_TEMPLATE/enhancement.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-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
deleted file mode 100644
index add65c69..00000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: Question
-about: Question
-title: ''
-labels: ''
-assignees: ''
-
----
-
-## Which version are you using?
-
-v0.0.0
-
-## Question
-
-Description