diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 22a25ebf..99af2da8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,7 +1,6 @@
 name: Bug Report
 description: "Report some other kind of issue."
 labels: [ "Type: Bug" ]
-type: "Bug"
 body:
   - type: textarea
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/compat_report.yml b/.github/ISSUE_TEMPLATE/compat_report.yml
index 0b14b343..98cff27c 100644
--- a/.github/ISSUE_TEMPLATE/compat_report.yml
+++ b/.github/ISSUE_TEMPLATE/compat_report.yml
@@ -1,7 +1,6 @@
-name: Bug Report
+name: Compatibility Report
 description: "Report some other kind of incompatibility with another mod."
 labels: [ "Type: Compatibility" ]
-type: "Bug"
 body:
   - type: textarea
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/crash_report.yml b/.github/ISSUE_TEMPLATE/crash_report.yml
index 550dd288..7e5e59ab 100644
--- a/.github/ISSUE_TEMPLATE/crash_report.yml
+++ b/.github/ISSUE_TEMPLATE/crash_report.yml
@@ -1,7 +1,6 @@
-name: Bug Report
+name: Crash Report
 description: "Report a crash."
 labels: [ "Type: Crash" ]
-type: "Bug"
 body:
   - type: textarea
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/documentation_request.yml b/.github/ISSUE_TEMPLATE/documentation_request.yml
index 54fafff4..bb4058d7 100644
--- a/.github/ISSUE_TEMPLATE/documentation_request.yml
+++ b/.github/ISSUE_TEMPLATE/documentation_request.yml
@@ -1,13 +1,12 @@
-name: Feature request
+name: Documentation request
 description: "Suggest an idea/change for the documentation"
-labels: [ "Type: Documentation" ]
-type: "Feature"
+labels: [ "Type: Enhancement" ]
 body:
   - type: textarea
     attributes:
-    label: Which page would you like to have added to/changed?
-    description: >
-      Please describe what you want to be added/changed.
+      label: Which page would you like to have added to/changed?
+      description: >
+        Please describe what you want to be added/changed.
     validations:
         required: true
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index dc88b1b8..2ee4e734 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,13 +1,14 @@
 name: Feature request
 description: "Suggest an idea for the mod"
 labels: [ "Type: Enhancement" ]
-type: "Feature"
 body:
-  - - type: textarea
-  - attributes:
-  - label: What feature do you want to be added?
-  - description: >
-      Please describe what you want to be added.
+  - type: textarea
+    attributes:
+      label: What feature do you want to be added?
+      description: >
+        Please describe what you want to be added.
+    validations:
+      required: true
 
   - type: textarea
     attributes: