diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 515e26182..c61f5b6b9 100755
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -6,7 +6,7 @@ I acknowledge that:
   - To the latest version of the app (stable is v1.10.2)
   - All extensions
 - I have gone through the FAQ (https://tachiyomi.org/docs/faq/general) and troubleshooting guide (https://tachiyomi.org/docs/guides/troubleshooting/)
-- If this is an issue with an extension, that I should be opening an issue in it's repository
+- If this is an issue with an official extension, that I should be opening an issue in https://github.com/cuong-tran/tachiyomi-extensions/
 - I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open or closed issue
 - I will fill out the title and the information in this template
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index c5ec2d69f..2b65b3c9e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,11 @@
 blank_issues_enabled: false
 contact_links:
+  - name: ⚠️ Extension/source issue
+    url: https://github.com/cuong-tran/tachiyomi-extensions/issues/new/choose
+    about: Issues and requests for official extensions and sources should be opened in the extensions repository instead
+  - name: 📦 Extensions
+    url: https://cuong-tran.github.io/tachiyomi-extensions/
+    about: List of all available extensions with download links
   - name: 🖥️ Tachiyomi website
     url: https://tachiyomi.org/
     about: Guides, troubleshooting, and answers to common questions
diff --git a/.github/ISSUE_TEMPLATE/report_issue.yml b/.github/ISSUE_TEMPLATE/report_issue.yml
index b2e523ec3..fd5ae3dec 100644
--- a/.github/ISSUE_TEMPLATE/report_issue.yml
+++ b/.github/ISSUE_TEMPLATE/report_issue.yml
@@ -1,5 +1,5 @@
 name: 🐞 Issue report
-description: Report an issue in Tachiyomi
+description: Report an issue in Komikku
 labels: [Bug]
 body:
 
@@ -48,10 +48,10 @@ body:
         You can paste the crash logs in plain text or upload it as an attachment.
 
   - type: input
-    id: tachiyomi-version
+    id: komikku-version
     attributes:
-      label: Tachiyomi version
-      description: You can find your Tachiyomi version in **More → About**.
+      label: Komikku version
+      description: You can find your Komikku version in **More → About**.
       placeholder: |
         Example: "1.10.2"
     validations:
@@ -94,11 +94,11 @@ body:
           required: true
         - label: I have written a short but informative title.
           required: true
-        - label: If this is an issue with an extension, I should be opening an issue in the extension's repository.
+        - label: If this is an issue with an official extension, I should be opening an issue in the [extensions repository](https://github.com/cuong-tran/tachiyomi-extensions/issues/new/choose).
           required: true
         - label: I have gone through the [FAQ](https://tachiyomi.org/docs/faq/general) and [troubleshooting guide](https://tachiyomi.org/docs/guides/troubleshooting/).
           required: true
-        - label: I have updated the app to version **[1.10.2](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
+        - label: I have updated the app to version **[1.10.2](https://github.com/cuong-tran/komikku/releases/latest)**.
           required: true
         - label: I have updated all installed extensions.
           required: true
diff --git a/.github/ISSUE_TEMPLATE/request_feature.yml b/.github/ISSUE_TEMPLATE/request_feature.yml
index 20ed9df6a..597bc7ceb 100644
--- a/.github/ISSUE_TEMPLATE/request_feature.yml
+++ b/.github/ISSUE_TEMPLATE/request_feature.yml
@@ -1,5 +1,5 @@
 name: ⭐ Feature request
-description: Suggest a feature to improve Tachiyomi
+description: Suggest a feature to improve Komikku
 labels: [Feature request]
 body:
 
@@ -7,7 +7,7 @@ body:
     id: feature-description
     attributes:
       label: Describe your suggested feature
-      description: How can Tachiyomi be improved?
+      description: How can Komikku be improved?
       placeholder: |
         Example:
           "It should work like this..."
@@ -31,9 +31,9 @@ body:
           required: true
         - label: I have written a short but informative title.
           required: true
-        - label: If this is an issue with an official extension, I should be opening an issue in the extension's repository.
+        - label: If this is an issue with an official extension, I should be opening an issue in the [extensions repository](https://github.com/cuong-tran/tachiyomi-extensions/issues/new/choose).
           required: true
-        - label: I have updated the app to version **[1.10.2](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
+        - label: I have updated the app to version **[1.10.2](https://github.com/cuong-tran/komikku/releases/latest)**.
           required: true
         - label: I will fill out all of the requested information in this form.
           required: true