diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..3ba13e0ce
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/feature_enhancement.md b/.github/ISSUE_TEMPLATE/feature_enhancement.md
deleted file mode 100644
index ad5275438..000000000
--- a/.github/ISSUE_TEMPLATE/feature_enhancement.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Feature or Enhancement
-about: Open an issue to give some suggestion on a feature.
-title: "[New Feature] Your new feature title here"
-labels: new-feature
-assignees: ''
----
-<!--
-  Fill in the placeholders below. Delete any headings and placeholders that you do not fill in. 
--->
-### Description:
-<!-- Describe your feature request here. -->
-
-### Possible Implementation:
-<!-- Tell us how this could be implemented, example INI code, etc. -->
-
-### Additional Files:
-<!-- Attach additional files related to the feature report here (images/gifs/videos etc). -->
diff --git a/.github/ISSUE_TEMPLATE/feature_enhancement.yml b/.github/ISSUE_TEMPLATE/feature_enhancement.yml
new file mode 100644
index 000000000..dc72608c5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_enhancement.yml
@@ -0,0 +1,57 @@
+name: Feature or Enhancement Request
+description: Open an issue to give request a feature or engine enhancement.
+title: "[New Feature] Your new feature request title here"
+labels: [new-feature]
+body:
+  - type: markdown
+    attributes:
+      description: |
+        Thanks for taking the time to post a new feature or enhancement request.
+
+        Please follow these instructions and fill in every question with as much detial as possible.
+        
+        __NOTE: Please do not remove the `[New Feature]` prefix from the issue title, this helps us with filtering issues.__
+
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: First Check
+      description: Please confirm and check all the following options.
+      options:
+        - label: I added a very descriptive title to this issue.
+          required: true
+        - label: I used the GitHub search to find a similar issue and didn't find it.
+          required: true
+        - label: I have attached as much information as possible (screenshots, debug logs, etc).
+          required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Describe your new feature or enhancement request here. Please use as much detail as possible.
+
+    validations:
+      required: true
+
+  - type: textarea
+    id: implementation
+    attributes:
+      label: Example Code
+      description: |
+        Tell us how this new feature could be implemented, using any example INI code, etc.
+      placeholder: |
+        For example;
+        
+        [GAPOWR]
+        NewFeatureValue=500
+        render: ini
+    validations:
+      required: false
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional Context
+      description: Add any additional context information, screenshots, images, videos, debug logs, and/or exception files you think would be useful.
diff --git a/.github/ISSUE_TEMPLATE/vanilla_bugfix_request.md b/.github/ISSUE_TEMPLATE/vanilla_bugfix_request.md
deleted file mode 100644
index 54bfc5dd3..000000000
--- a/.github/ISSUE_TEMPLATE/vanilla_bugfix_request.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Vanilla Bugfix Request
-about: Open an issue to ask for a vanilla bug to be fixed.
-title: "[Vanilla Bug] Your bug report title here"
-labels: vanilla-bug
-assignees: ''
----
-<!--
-  Fill in the placeholders below. Delete any headings and placeholders that you do not fill in. 
--->
-### Description:
-<!-- Detailed summary of what the bug is. -->
-
-### Conditions:
-<!-- Any INI code or external changes that are used to reproduce the bug. -->
-
-### Steps To Reproduce:
-<!-- Tell us how to reproduce this issue so the developer(s) can reproduce the bug. -->
-1.
-2.
-3.
-
-### Expected Behaviour:
-<!-- Tell us what should happen. -->
-
-### Actual Behaviour:
-<!-- Tell us what happens instead. -->
-
-### Additional Files:
-<!-- Attach additional files related to the bug report here.
-A debug log and exception file are mandatory if you're submitting a crash report.
-Images/gifs/videos to illustrate the bug, or a savegame file. -->
diff --git a/.github/ISSUE_TEMPLATE/vanilla_bugfix_request.yml b/.github/ISSUE_TEMPLATE/vanilla_bugfix_request.yml
new file mode 100644
index 000000000..648c8a994
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/vanilla_bugfix_request.yml
@@ -0,0 +1,93 @@
+name: Vanilla Bugfix Request
+description: Open an issue to request a vanilla bug to be fixed.
+title: "[Vanilla Bug] Your bug report title here"
+labels: [vanilla-bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to report a vanilla Tiberian Sun bug.
+
+        Please follow these instructions and fill in every question with as much detial as possible.
+        
+        __NOTE: Please do not remove the `[Vanilla Bug]` prefix from the issue title, this helps us with filtering issues.__
+
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: First Check
+      description: Please confirm and check all the following options.
+      options:
+        - label: I added a very descriptive title to this issue.
+          required: true
+        - label: I used the GitHub search to find a similar issue and didn't find it.
+          required: true
+        - label: I have attached as much information as possible (screenshots, debug logs, etc).
+          required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        What is the bug, issue, or crash?
+
+        Write a detailed description telling us what the issue is.
+    validations:
+      required: true
+
+  - type: textarea
+    id: example-code
+    attributes:
+      label: Example Code
+      description: |
+        Any INI code or external changes that are required to reproduce the bug.
+      placeholder: |
+        For example;
+        
+        [GAPOWR]
+        Cost=500
+        render: ini
+    validations:
+      required: false
+      
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps To Reproduce
+      description: |
+        Tell us how to reproduce this issue so the developer(s) can reproduce the bug.
+      placeholder: |
+        For example;
+        
+        1. Start a skirmish game.
+        2. Build a power plant.
+        3. Save the game.
+        etc.
+        
+    validations:
+      required: true
+      
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Behaviour
+      description: |
+        Tell us what should happen.
+    validations:
+      required: true
+      
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual Behaviour
+      description: |
+        Tell us what happens instead.
+    validations:
+      required: true
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional Context
+      description: Add any additional context information, screenshots, images, videos, debug logs, and/or exception files you think would be useful.
diff --git a/.github/ISSUE_TEMPLATE/vinifera_bugfix_request.md b/.github/ISSUE_TEMPLATE/vinifera_bugfix_request.md
deleted file mode 100644
index 86d27ca8e..000000000
--- a/.github/ISSUE_TEMPLATE/vinifera_bugfix_request.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Vinifera Bugfix Request
-about: Open an issue to ask for a Vinifera bug to be fixed.
-title: "[Vinifera Bug] Your bug report title here"
-labels: vinifera-bug
-assignees: ''
----
-<!--
-  Fill in the placeholders below. Delete any headings and placeholders that you do not fill in. 
--->
-### Description:
-<!-- Detailed summary of what the bug is. -->
-
-### Conditions:
-<!-- Any INI code or external changes that are used to reproduce the bug. -->
-
-### Steps To Reproduce:
-<!-- Tell us how to reproduce this issue so the developer(s) can reproduce the bug. -->
-1.
-2.
-3.
-
-### Expected Behaviour:
-<!-- Tell us what should happen. -->
-
-### Actual Behaviour:
-<!-- Tell us what happens instead. -->
-
-### Additional Files:
-<!-- Attach additional files related to the bug report here.
-A debug log and exception file are mandatory if you're submitting a crash report.
-Images/gifs/videos to illustrate the bug, or a savegame file. -->
diff --git a/.github/ISSUE_TEMPLATE/vinifera_bugfix_request.yml b/.github/ISSUE_TEMPLATE/vinifera_bugfix_request.yml
new file mode 100644
index 000000000..069f742c9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/vinifera_bugfix_request.yml
@@ -0,0 +1,104 @@
+name: Vinifera Bugfix Request
+description: Open an issue to ask for a Vinifera bug to be fixed.
+title: "[Vinifera Bug] Your bug report title here"
+labels: [vinifera-bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to report a Vinifera bug.
+
+        Please follow these instructions and fill in every question with as much detial as possible.
+        
+        __NOTE: Please do not remove the `[Vinifera Bug]` prefix from the issue title, this helps us with filtering issues.__
+
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: First Check
+      description: Please confirm and check all the following options.
+      options:
+        - label: I added a very descriptive title to this issue.
+          required: true
+        - label: I used the GitHub search to find a similar issue and didn't find it.
+          required: true
+        - label: I have attached as much information as possible (screenshots, debug logs, etc).
+          required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        What is the bug, issue, or crash?
+
+        Write a detailed description telling us what the issue is.
+    validations:
+      required: true
+
+  - type: textarea
+    id: example-code
+    attributes:
+      label: Example Code
+      description: |
+        Any INI code or external changes that are required to reproduce the bug.
+      placeholder: |
+        For example;
+        
+        [GAPOWR]
+        Cost=500
+        render: ini
+    validations:
+      required: false
+      
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps To Reproduce
+      description: |
+        Tell us how to reproduce this issue so the developer(s) can reproduce the bug.
+      placeholder: |
+        For example;
+        
+        1. Start a skirmish game.
+        2. Build a power plant.
+        3. Save the game.
+        etc.
+        
+    validations:
+      required: true
+      
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Behaviour
+      description: |
+        Tell us what should happen.
+    validations:
+      required: true
+      
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual Behaviour
+      description: |
+        Tell us what happens instead.
+    validations:
+      required: true
+      
+  - type: input
+    id: vinifera-version
+    attributes:
+      label: Version
+      description: |
+        What version of Vinifera are you using?
+
+        You can find the Vinifera version on the bottom right of the main menu.
+    validations:
+      required: true
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional Context
+      description: Add any additional context information, screenshots, images, videos, debug logs, and/or exception files you think would be useful.