diff --git a/.github/ISSUE_TEMPLATE/-----epg-request.yml b/.github/ISSUE_TEMPLATE/-----epg-request.yml
deleted file mode 100644
index 9433e48a..00000000
--- a/.github/ISSUE_TEMPLATE/-----epg-request.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: 🗓 EPG Request
-description: Request to add a new EPG (Electronic Programming Guide) source to the repository
-labels: ['🗓 epg request']
-
-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: Source
-      description: Website where the EPG can be found?
-      placeholder: 'https://cablecompany.com/tvlisting'
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Notes
-      description: 'Anything else that helps? API Url, Etc'
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/----channel-request.yml b/.github/ISSUE_TEMPLATE/----channel-request.yml
deleted file mode 100644
index 2205a24f..00000000
--- a/.github/ISSUE_TEMPLATE/----channel-request.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: 📺 Channel Request
-description: Request to add channels to the guide
-labels: ['📺 channel request']
-
-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: Source
-      description: Website where the EPG for these channels can be found?
-      placeholder: 'https://cablecompany.com/tvlisting'
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Channels
-      description: List all channels that need to be added
-      placeholder: |
-        - Channel1
-        - Channel2
-        ...
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Notes
-      description: Anything else we should know?
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/----epg-request.yml b/.github/ISSUE_TEMPLATE/----epg-request.yml
new file mode 100644
index 00000000..a8ba453f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/----epg-request.yml
@@ -0,0 +1,30 @@
+name: 🗓 EPG Request
+description: Request to add a EPG (Electronic Programming Guide) for a specific channel
+labels: ['🗓 epg request']
+
+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: Channel ID
+      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=channel+request&template=---channel-request.yml&title=Add%3A+).
+      placeholder: 'BBCAmericaEast.us'
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Source
+      description: Website where the EPG can be found?
+      placeholder: 'https://cablecompany.com/tvlisting'
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Notes
+      description: Anything else we should know?
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/---broken-guide.yml b/.github/ISSUE_TEMPLATE/---broken-guide.yml
index c48bcd44..c7f911f9 100644
--- a/.github/ISSUE_TEMPLATE/---broken-guide.yml
+++ b/.github/ISSUE_TEMPLATE/---broken-guide.yml
@@ -1,5 +1,5 @@
 name: ⚠️ Broken Guide
-description: Report an error in the guide
+description: Report an error in one of the guides
 labels: ['⚠️ broken guide']
 
 body:
@@ -12,7 +12,7 @@ body:
     attributes:
       label: Guide
       description: Link to the broken guide
-      placeholder: 'https://iptv-org.github.io/epg/guides/us/directv.com.epg.xml.gz'
+      placeholder: 'https://iptv-org.github.io/epg/guides/us.xml'
     validations:
       required: true
 
diff --git a/.github/ISSUE_TEMPLATE/-bug-report.yml b/.github/ISSUE_TEMPLATE/-bug-report.yml
deleted file mode 100644
index 76da92ca..00000000
--- a/.github/ISSUE_TEMPLATE/-bug-report.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: 🐞 Bug Report
-description: Report an error in this repository
-labels: ['🐞 bug']
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please describe the error in as much detail as possible so that we can fix it quickly.
-
-  - type: textarea
-    attributes:
-      label: Description
-    validations:
-      required: true