diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index a7560fc696..4994debbb0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,13 +1,8 @@
 name: Bug Report
 description: File a bug report
+title: "[Bug] <title>"
+labels: bug
 body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the bug you encountered.
-      options:
-      - label: I have searched the existing issues
-        required: true
   - type: textarea
     id: issue
     attributes:
@@ -53,17 +48,43 @@ body:
         - *(e.g. 1.1.1)*
     validations:
       required: false
-  - type: textarea
-    id: environment
+  - type: input
+    id: cpu
     attributes:
-      label: Environment?
-      value: |
-        - ##### CPU: *(e.g. i7-6700)*
-        - ##### GPU: *(e.g. NVIDIA RTX 2070)*
-        - ##### RAM: *(e.g. 16GB)*
-        - Applied Mods: [ Yes (Which ones) / No ]
+      label: CPU
+      placeholder: |
+        - *(e.g. i7-6700)*
     validations:
-      required: true
+      required: false
+  - type: input
+    id: gpu
+    attributes:
+      label: GPU
+      placeholder: |
+        - *(e.g. NVIDIA RTX 2070)*
+    validations:
+      required: false
+  - type: input
+    id: ram
+    attributes:
+      label: RAM
+      placeholder: |
+        - *(e.g. 16GB)*
+    validations:
+      required: false
+  - type: checkboxes
+    attributes:
+      label: Applied Mods?
+      options:
+      - label: Yes
+        required: false
+  - type: textarea
+    id: mods
+    attributes:
+      label: List of applied mods
+      placeholder: You can list applied mods here.
+    validations:
+      required: false
   - type: textarea
     id: additional-context
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index f755812f69..a9a5b504ad 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,13 +1,7 @@
 name: Feature Request
 description: Suggest a new feature for Ryujinx.
+title: "[Feature Request] <title>"
 body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the feature you are requesting.
-      options:
-      - label: I have searched the existing issues
-        required: true
   - type: textarea
     id: overview
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/missing_cpu_instruction.yml b/.github/ISSUE_TEMPLATE/missing_cpu_instruction.yml
index 237e61e91c..10e3bad377 100644
--- a/.github/ISSUE_TEMPLATE/missing_cpu_instruction.yml
+++ b/.github/ISSUE_TEMPLATE/missing_cpu_instruction.yml
@@ -1,13 +1,8 @@
 name: Missing CPU Instruction
 description: CPU Instruction is missing in Ryujinx.
+title: "[CPU] <title>"
+labels: [cpu, not-implemented]
 body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      description: Please search for existing missing CPU instruction
-      options:
-      - label: I have searched the existing issues
-        required: true
   - type: textarea
     id: instruction
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/missing_service_call.yml b/.github/ISSUE_TEMPLATE/missing_service_call.yml
index 72a521173b..48d46d57f0 100644
--- a/.github/ISSUE_TEMPLATE/missing_service_call.yml
+++ b/.github/ISSUE_TEMPLATE/missing_service_call.yml
@@ -1,13 +1,7 @@
 name: Missing Service Call
 description: Service call is missing in Ryujinx.
+labels: not-implemented
 body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      description: Please search for an [existing missing service call issue](https://github.com/Ryujinx/Ryujinx/issues) first.
-      options:
-      - label: I have searched the existing issues
-        required: true
   - type: textarea
     id: instruction
     attributes: