diff --git a/.github/ISSUE_TEMPLATE/-----streams_add.yml b/.github/ISSUE_TEMPLATE/1_streams_add.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/-----streams_add.yml
rename to .github/ISSUE_TEMPLATE/1_streams_add.yml
diff --git a/.github/ISSUE_TEMPLATE/----streams_edit.yml b/.github/ISSUE_TEMPLATE/2_streams_edit.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/----streams_edit.yml
rename to .github/ISSUE_TEMPLATE/2_streams_edit.yml
diff --git a/.github/ISSUE_TEMPLATE/--broken-stream.yml b/.github/ISSUE_TEMPLATE/3_broken-stream.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/--broken-stream.yml
rename to .github/ISSUE_TEMPLATE/3_broken-stream.yml
diff --git a/.github/ISSUE_TEMPLATE/4_channel-search.yml b/.github/ISSUE_TEMPLATE/4_channel-search.yml
new file mode 100644
index 000000000..cc69b18bb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/4_channel-search.yml
@@ -0,0 +1,18 @@
+name: 🔍 Channel search
+description: Ask for help in finding a link to the channel stream.
+title: 'Find: '
+labels: ['channel search']
+
+body:
+  - type: input
+    attributes:
+      label: Channel ID (required)
+      description: Unique channel ID from [iptv-org.github.io](https://iptv-org.github.io/). If you can't find the channel you want in the list, please let us know through this [form](https://github.com/iptv-org/database/issues/new?assignees=&labels=channels%3Aadd&projects=&template=channels_add.yml&title=Add%3A+) before posting your request.
+      placeholder: 'BBCAmericaEast.us'
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Notes
+      description: 'Any additional information that may help find a link to the stream faster?'
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/--bug-report.yml b/.github/ISSUE_TEMPLATE/5_bug-report.yml
similarity index 92%
rename from .github/ISSUE_TEMPLATE/--bug-report.yml
rename to .github/ISSUE_TEMPLATE/5_bug-report.yml
index f0a1bcefe..d93ed317e 100644
--- a/.github/ISSUE_TEMPLATE/--bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/5_bug-report.yml
@@ -1,4 +1,4 @@
-name: 🐞 Bug Report
+name: 🐞 Bug report
 description: Report an error in this repository
 labels: ['bug']
 
diff --git a/.github/ISSUE_TEMPLATE/-copyright-claim.yml b/.github/ISSUE_TEMPLATE/6_copyright-claim.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/-copyright-claim.yml
rename to .github/ISSUE_TEMPLATE/6_copyright-claim.yml
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index f2ebe6ed8..f303ae6ee 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,5 @@
 blank_issues_enabled: true
 contact_links:
-  - name: 🔍 Looking for a channel
-    url: https://github.com/orgs/iptv-org/discussions/categories/channel-search
-    about: Need help finding a link to a channel stream
   - name: 💡 Feature request
     url: https://github.com/orgs/iptv-org/discussions/categories/ideas
     about: For any ideas or feature requests