diff --git a/.github/ISSUE_TEMPLATE/----broken-stream.yml b/.github/ISSUE_TEMPLATE/-----broken-stream.yml
similarity index 99%
rename from .github/ISSUE_TEMPLATE/----broken-stream.yml
rename to .github/ISSUE_TEMPLATE/-----broken-stream.yml
index 085609c396..a532733d85 100644
--- a/.github/ISSUE_TEMPLATE/----broken-stream.yml
+++ b/.github/ISSUE_TEMPLATE/-----broken-stream.yml
@@ -1,6 +1,6 @@
 name: 🛠 Broken Stream
 description: Report a broken stream
-title: "Fix: "
+title: "Replace: "
 labels: [ "broken stream" ]
 
 body:
diff --git a/.github/ISSUE_TEMPLATE/-----bug-report.yml b/.github/ISSUE_TEMPLATE/----bug-report.yml
similarity index 75%
rename from .github/ISSUE_TEMPLATE/-----bug-report.yml
rename to .github/ISSUE_TEMPLATE/----bug-report.yml
index 27b6075429..f8c013173a 100644
--- a/.github/ISSUE_TEMPLATE/-----bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/----bug-report.yml
@@ -10,7 +10,7 @@ body:
     attributes:
       value: |
        This form is **ONLY** intended for auto-update, channel sorting and other automation scripts related issues.
-       If you're experiencing problems viewing a channel, **this is not the right form**. Please file a Broken stream form instead.
+       If you're experiencing problems viewing a channel, **this is not the right form**. Please fill a [Broken stream](https://github.com/iptv-org/iptv/issues/new?assignees=&labels=broken+stream&template=----broken-stream.yml&title=Fix%3A+) form instead.
 
        Please describe the error in as much detail as possible so that we can fix it quickly.