diff --git a/.github/ISSUE_TEMPLATE/1_streams_add.yml b/.github/ISSUE_TEMPLATE/1_streams_add.yml
index b67ab964ad..7a7864525f 100644
--- a/.github/ISSUE_TEMPLATE/1_streams_add.yml
+++ b/.github/ISSUE_TEMPLATE/1_streams_add.yml
@@ -22,6 +22,28 @@ body:
     validations:
       required: true
 
+  - type: dropdown
+    id: live_247
+    attributes:
+      label: Live 24/7 (required)
+      description: Is this stream active 24 hours a day?
+      options:
+        - 'Yes'
+        - 'No'
+    validations:
+      required: true
+
+  - type: dropdown
+    id: geo_blocked
+    attributes:
+      label: Geo-blocked (required)
+      description: Is this stream blocked in any country?
+      options:
+        - 'No'
+        - 'Yes'
+    validations:
+      required: true
+
   - type: dropdown
     id: quality
     attributes:
@@ -40,15 +62,6 @@ body:
         - 480i
         - 360p
 
-  - type: dropdown
-    id: label
-    attributes:
-      label: Label
-      description: Is there any reason why the broadcast may not work?
-      options:
-        - 'Not 24/7'
-        - 'Geo-blocked'
-
   - type: input
     id: http_user_agent
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/2_streams_edit.yml b/.github/ISSUE_TEMPLATE/2_streams_edit.yml
index 88905f24b7..f0c6b9ece7 100644
--- a/.github/ISSUE_TEMPLATE/2_streams_edit.yml
+++ b/.github/ISSUE_TEMPLATE/2_streams_edit.yml
@@ -25,6 +25,24 @@ body:
       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
+    id: live_247
+    attributes:
+      label: Live 24/7
+      description: Is this stream active 24 hours a day?
+      options:
+        - 'Yes'
+        - 'No'
+
+  - type: dropdown
+    id: geo_blocked
+    attributes:
+      label: Geo-blocked
+      description: Is this stream blocked in any country?
+      options:
+        - 'No'
+        - 'Yes'
+
   - type: dropdown
     id: quality
     attributes:
@@ -41,17 +59,6 @@ body:
         - 480p
         - 480i
         - 360p
-        - '~'
-
-  - type: dropdown
-    id: label
-    attributes:
-      label: Label
-      description: Is there any reason why the broadcast may not work?
-      options:
-        - 'Not 24/7'
-        - 'Geo-blocked'
-        - '~'
 
   - type: input
     id: http_user_agent