diff --git a/.github/ISSUE_TEMPLATE/----feature-request.md b/.github/ISSUE_TEMPLATE/----feature-request.md
deleted file mode 100644
index 378d29ed01..0000000000
--- a/.github/ISSUE_TEMPLATE/----feature-request.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: '✨ Feature Request'
-about: For any ideas or feature requests
-title: 'Propose: xxx'
-labels: discussion
-assignees: ''
----
-
-<!-- Please describe your idea as fully as possible -->
diff --git a/.github/ISSUE_TEMPLATE/---ask-a-question.md b/.github/ISSUE_TEMPLATE/---ask-a-question.md
deleted file mode 100644
index d588ea715a..0000000000
--- a/.github/ISSUE_TEMPLATE/---ask-a-question.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: "❓Ask a question"
-about: Ask questions about this project
-title: 'Question: xxx'
-labels: question
-assignees: ''
-
----
-
-
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..b07f8cac26
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 💡 Feature Request
+    url: https://github.com/iptv-org/iptv/discussions/new
+    about: For any ideas or feature requests
+  - name: ❓ Ask a question
+    url: https://github.com/iptv-org/iptv/discussions/new
+    about: Ask questions about this project
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 11d5bebdbf..fff6051069 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,10 +9,6 @@ Before submitting your contribution, please make sure to take a moment and read
 
 ## Issue Reporting Guidelines
 
-### Feature Requests
-
-If you have an idea how to improve the project create an [issue](https://github.com/iptv-org/iptv/issues/new?assignees=&labels=discussion&template=----feature-request.md&title=Propose%3A+xxx) with a detailed description of your idea.
-
 ### Request a Channel
 
 To request a channel, create an [issue](https://github.com/iptv-org/iptv/issues/new?assignees=&labels=channel+request&template=------channel-request.md&title=Add%3A+xxx) and complete all details requested. (**IMPORTANT:** the issue should contain a request for only one channel, otherwise it will be closed immediately). Understand that our community of volunteers will try to help you, but if a public link cannot be found, there is little we can do.