diff --git a/.github/ISSUE_TEMPLATE/0-feature.md b/.github/ISSUE_TEMPLATE/0-feature.md
deleted file mode 100644
index 3ae1cc6822..0000000000
--- a/.github/ISSUE_TEMPLATE/0-feature.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: "✨ New feature"
-about: Suggest an idea for this project
-title: "✨"
-labels: ['Type: Feature / Enhancement', 'Type: Suggestion']
-assignees: ''
-
----
-
-<!--Please provide a clear and concise description of what the bug is.-->
-#### Brief description of the feature
-
-<!--Please use as much detail as possible when describing the bug behavior, including any context (things you did before) that might be relevant.-->
-#### What you want to happen
- 
-<!--Optional, you may remove this section.-->
-#### Anything else you may wish to add:
-- (Location if it's a mapping issue, screenshots, sprites, etc.)
diff --git a/.github/ISSUE_TEMPLATE/0-feature.yml b/.github/ISSUE_TEMPLATE/0-feature.yml
new file mode 100644
index 0000000000..d8adbbed9c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/0-feature.yml
@@ -0,0 +1,29 @@
+name: "✨ New feature"
+description: Suggest an idea for this codebase
+title: "✨ <title>"
+type: 'feature'
+labels: ['Type: Feature/Suggestion']
+body:
+- type: textarea
+  attributes:
+    label: Brief description of the feature
+    description: "Please provide a clear and concise description of what the feature should be."
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: What you want to happen
+    description: "Please use as much detail as possible when describing the feature behavior, including any context that might be relevant."
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Anything else you may wish to add
+    description: |
+      Location if it's a mapping issue, screenshots, sprites, etc.
+
+      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+  validations:
+    required: false
diff --git a/.github/ISSUE_TEMPLATE/3-map_report.yml b/.github/ISSUE_TEMPLATE/3-map_report.yml
new file mode 100644
index 0000000000..2e7a4112d2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3-map_report.yml
@@ -0,0 +1,56 @@
+name: Map Bug
+description: Create a report, specific to any map related things.
+title: '[MAPPING] <title>'
+type: 'bug'
+labels: ['Type: Bug', 'Type: Map']
+body:
+- type: textarea
+  attributes:
+    label: Brief description of the bug
+    description: "Please provide a clear and concise description of what the bug is."
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: What you expected to happen
+    description: "What normally happens when this occurs? Keep in mind that behavior may be different on other servers."
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: What actually happened
+    description: "Please use as much detail as possible when describing the bug behavior, including any context (things you did before) that might be relevant."
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Reproduction steps
+    description: "How do you trigger this bug? Please walk us through it step by step."
+    value: |
+      1.
+      2.
+      3.
+      ...
+    render: bash
+  validations:
+    required: true
+
+- type: input
+  attributes:
+    label: Code Revision
+    description: "Found using the 'Show Server Revision' verb under the OOC tab."
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Anything else you may wish to add
+    description: |
+      Location if it's a mapping issue, screenshots, sprites, etc.
+
+      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+  validations:
+    required: false
diff --git a/.github/ISSUE_TEMPLATE/map_report.md b/.github/ISSUE_TEMPLATE/map_report.md
deleted file mode 100644
index b803d9c0b9..0000000000
--- a/.github/ISSUE_TEMPLATE/map_report.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-name: Map Bug report
-about: Create a report, specific to any map related things.
-title: '[MAPPING] '
-labels: ['Type: Bug', 'Map Edit']
-assignees: ''
-
----
-
-<!-- Please DO NOT report 'suggestions' on GitHub. If your issue consists of an opinion about how something should be, it doesn't belong here. -->
-<!-- If your issue consists of something not operating as intended, please report it below by filling out the template. -->
-<!-- These directions will not appear in the issue, when submitted. -->
-
-<!--Please provide a clear and concise description of what the bug is.-->
-#### Brief description of the bug
-
-<!--What normally happens when this occurs? Keep in mind that behavior may be different on other servers.-->
-#### What you expected to happen
-
-<!--Please use as much detail as possible when describing the bug behavior, including any context (things you did before) that might be relevant.-->
-#### What actually happened
-
-<!--Optional, you may remove this section.-->
-#### Code Revision
-- (Found using the "Show Server Revision" verb under the OOC tab.)
- 
-<!--Optional, you may remove this section.-->
-#### Anything else you may wish to add:
-- (Location if it's a mapping issue, screenshots, sprites, etc.)