diff --git a/.github/ISSUE_TEMPLATE/-----broken-stream.yml b/.github/ISSUE_TEMPLATE/-----broken-stream.yml
index 25713bbf2a..e71b68f3b8 100644
--- a/.github/ISSUE_TEMPLATE/-----broken-stream.yml
+++ b/.github/ISSUE_TEMPLATE/-----broken-stream.yml
@@ -26,7 +26,6 @@ body:
         - Stuck at a single frame
         - I see visual artifacts
         - Shows looped video
-        - Shows the wrong channel
         - No sound
         - Displays a message asking to renew subscription
         - Other
diff --git a/.github/ISSUE_TEMPLATE/----bug-report.yml b/.github/ISSUE_TEMPLATE/----bug-report.yml
deleted file mode 100644
index aa54b5b2b5..0000000000
--- a/.github/ISSUE_TEMPLATE/----bug-report.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: 🐞 Bug Report
-description: Report an error in this repository
-title: 'Fix: '
-labels: ['🐞 bug']
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        This form is only for reporting bugs with auto-update, channel sorting and other problems with automation scripts. If you're experiencing problems viewing a channel please fill a [Broken Stream](https://github.com/iptv-org/iptv/issues/new?labels=🛠+broken+stream&template=-----broken-stream.yml&title=Broken%3A+) form instead.
-
-  - type: textarea
-    attributes:
-      label: Describe your issue
-      description: Please describe the error in as much detail as possible so that we can fix it quickly.
-    validations:
-      required: true
diff --git a/.github/ISSUE_TEMPLATE/----rename-request.yml b/.github/ISSUE_TEMPLATE/----rename-request.yml
new file mode 100644
index 0000000000..29bf713560
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/----rename-request.yml
@@ -0,0 +1,38 @@
+name: ✏️ Rename Stream
+description: Request to rename a stream
+title: 'Rename: '
+labels: ['misidentified']
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the issue template as much as you can so we could efficiently process your request
+
+  - type: input
+    attributes:
+      label: Stream URL
+      description: Link to the stream from a playlist
+      placeholder: 'https://lnc-kdfw-fox-aws.tubi.video/index.m3u8'
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Channel ID
+      description: Currect 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&template=channels_add.yml&title=Add%3A+).
+      placeholder: 'BBCAmericaEast.us'
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Notes (optional)
+      placeholder: 'Anything else we should know?'
+
+  - type: checkboxes
+    attributes:
+      label: Please confirm the following
+      options:
+        - label: I have read [Contributing Guide](https://github.com/iptv-org/iptv/blob/master/CONTRIBUTING.md#report-a-broken-stream)
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/---bug-report.yml b/.github/ISSUE_TEMPLATE/---bug-report.yml
new file mode 100644
index 0000000000..67f60e5407
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---bug-report.yml
@@ -0,0 +1,12 @@
+name: 🐞 Bug Report
+description: Report an error in this repository
+title: 'Fix: '
+labels: ['🐞 bug']
+
+body:
+  - type: textarea
+    attributes:
+      label: Describe your issue
+      description: Please describe the error in as much detail as possible so that we can fix it quickly.
+    validations:
+      required: true