diff --git a/.github/ISSUE_TEMPLATE/1_streams_add.yml b/.github/ISSUE_TEMPLATE/1_streams_add.yml
index 75d89b54f..2d3f9c793 100644
--- a/.github/ISSUE_TEMPLATE/1_streams_add.yml
+++ b/.github/ISSUE_TEMPLATE/1_streams_add.yml
@@ -6,9 +6,9 @@ labels: ['streams:add']
 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'
+      label: Stream ID (required)
+      description: "ID of the stream consisting of `<channel_id>` or `<channel_id>@<feed_id>`. Full list of supported channels with corresponding ID could be found on [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: 'BBCAmerica.us@East'
     validations:
       required: true
 
@@ -28,9 +28,12 @@ body:
         - 2160p
         - 1280p
         - 1080p
+        - 1080i
         - 720p
         - 576p
+        - 576i
         - 480p
+        - 480i
         - 360p
 
   - type: dropdown
diff --git a/.github/ISSUE_TEMPLATE/2_streams_edit.yml b/.github/ISSUE_TEMPLATE/2_streams_edit.yml
index 0231d30c0..1c9ab6200 100644
--- a/.github/ISSUE_TEMPLATE/2_streams_edit.yml
+++ b/.github/ISSUE_TEMPLATE/2_streams_edit.yml
@@ -19,9 +19,9 @@ body:
 
   - type: input
     attributes:
-      label: Channel ID 
-      description: Channel ID from [iptv-org.github.io](https://iptv-org.github.io/).
-      placeholder: 'BBCAmericaEast.us'
+      label: Stream ID
+      description: "ID of the stream consisting of `<channel_id>` or `<channel_id>@<feed_id>`. Full list of supported channels with corresponding ID could be found on [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: 'BBCAmerica.us@East'
 
   - type: dropdown
     attributes:
@@ -31,9 +31,12 @@ body:
         - 2160p
         - 1280p
         - 1080p
+        - 1080i
         - 720p
         - 576p
+        - 576i
         - 480p
+        - 480i
         - 360p
         - '~'
 
diff --git a/.github/ISSUE_TEMPLATE/3_broken-stream.yml b/.github/ISSUE_TEMPLATE/3_broken-stream.yml
index 12ed63a5b..67dcb462a 100644
--- a/.github/ISSUE_TEMPLATE/3_broken-stream.yml
+++ b/.github/ISSUE_TEMPLATE/3_broken-stream.yml
@@ -1,7 +1,7 @@
 name: 🚧 Report broken stream
 description: Report a broken or unstable stream
 title: 'Broken: '
-labels: ['broken stream']
+labels: ['broken stream', 'streams:remove']
 
 body:
   - type: markdown