diff --git a/.github/ISSUE_TEMPLATE/app-bug-report.yaml b/.github/ISSUE_TEMPLATE/app-bug-report.yaml
index 04fa79220..ecbbd6464 100644
--- a/.github/ISSUE_TEMPLATE/app-bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/app-bug-report.yaml
@@ -1,6 +1,6 @@
 # Docs - https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
 name: Application Bug Report
-description: Pproblem with the application itself (ie. bad file path handling, UX issue)
+description: Problem with the application itself (ie. bad file path handling, UX issue)
 title: "[APP BUG]: "
 body:
   - type: markdown
@@ -11,11 +11,11 @@ body:
         Please do not make support requests on GitHub. Our issue tracker is for tracking bugs and feature requests only
         If you need help using the emulator please make a request on our forums or contact us on discord.
 
-        If you are unsure, start with [discord](https://discord.gg/bFJxfftGW6) or the [forums](https://forums.shadps4.net/).
+        If you are unsure, start with [discord](https://discord.gg/bFJxfftGW6).
 
         Please make an effort to make sure your issue isn't already reported.
 
-        Do not create issues involving software piracy, our rules specifically prohibit this and your issue will be closed and you will be banned in this repository.
+        Do not create issues involving software piracy, our rules specifically prohibit this. Otherwise your issue will be closed and you will be banned in this repository.
   - type: checkboxes
     id: checklist
     attributes:
@@ -53,24 +53,3 @@ body:
       placeholder: "Example: Windows 11, Arch Linux, MacOS 15"
     validations:
       required: true
-  - type: input
-    id: cpu
-    attributes:
-      label: CPU
-      placeholder: "Example: i7-8700"
-    validations:
-      required: true
-  - type: input
-    id: gpu
-    attributes:
-      label: GPU
-      placeholder: "Example: GTX 1650"
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: "Logs"
-      description: Attach the logs here. Log can be found by right clicking on a game name -> Open Folder... -> Open Log Folder
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 60dde724a..5497e200d 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Support Forums
-    url: https://forums.shadps4.net/
-    about: For community support and answers
   - name: Discord
     url: https://discord.gg/bFJxfftGW6
     about: Get direct support and hang out with us
+  - name: Wiki
+    url: https://github.com/shadps4-emu/shadPS4/wiki
+    about: Information, guides, etc.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yaml b/.github/ISSUE_TEMPLATE/feature-request.yaml
index bd5f4f8db..a4b5d0eae 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yaml
@@ -10,8 +10,15 @@ body:
 
         Please make an effort to make sure your issue isn't already reported.
 
-        Do not create issues involving software piracy, our rules specifically prohibit this and your issue will be closed and you will be banned in this repository.
+        Do not create issues involving software piracy, our rules specifically prohibit this. Otherwise your issue will be closed and you will be banned in this repository.
 
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Checklist
+      options:
+        - label: I have searched for a similar issue in this repository and did not find one.
+          required: true
   - type: textarea
     id: desc
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/game-bug-report.yaml b/.github/ISSUE_TEMPLATE/game-bug-report.yaml
index 7a81b584f..78f706ae7 100644
--- a/.github/ISSUE_TEMPLATE/game-bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/game-bug-report.yaml
@@ -11,11 +11,12 @@ body:
         Please do not make support requests on GitHub. Our issue tracker is for tracking bugs and feature requests only
         If you need help using the emulator please make a request on our forums or contact us on discord.
 
-        If you are unsure, start with [discord](https://discord.gg/bFJxfftGW6) or the [forums](https://forums.shadps4.net/).
+        If you are unsure, start with [discord](https://discord.gg/bFJxfftGW6).
+        You can also check the [Game Compatibility Repository](https://github.com/shadps4-emu/shadps4-game-compatibility) for the information about the status of the game.
 
         Please make an effort to make sure your issue isn't already reported.
 
-        Do not create issues involving software piracy, our rules specifically prohibit this and your issue will be closed and you will be banned in this repository.
+        Do not create issues involving software piracy, our rules specifically prohibit this. Otherwise your issue will be closed and you will be banned in this repository.
   - type: checkboxes
     id: checklist
     attributes: