diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index ab0fe40219b..00000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-name: Bug report
-about: Technical issue with the OpenMage LTS core components
-title: ''
-labels: bug
-assignees: ''
-
----
-
-
-
-### Preconditions (*)
-
-1.
-2.
-
-### Steps to reproduce (*)
-
-1.
-2.
-
-### Expected result (*)
-
-1. [Screenshots, logs or description]
-2.
-
-### Actual result (*)
-
-1. [Screenshots, logs or description]
-2.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000000..eeda549bb8a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,57 @@
+name: 🐛 Bug report
+description: File a bug/issue
+title: "[BUG]
"
+labels: ["bug", "review needed"]
+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
+ attributes:
+ label: Current Behavior
+ description: A concise description of what you're experiencing.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Expected Behavior
+ description: A concise description of what you expected to happen.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Steps To Reproduce
+ description: Steps to reproduce the behavior.
+ placeholder: |
+ 1. In this environment...
+ 1. With this config...
+ 1. Run '...'
+ 1. See error...
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Environment
+ description: |
+ examples:
+ - **OpenMage**: 20.12.2
+ - **php**: 7.4
+ value: |
+ - OpenMage:
+ - php:
+ render: markdown
+ validations:
+ required: false
+ - type: textarea
+ attributes:
+ label: Anything else?
+ description: |
+ Links? References? Anything that will give us more context about the issue you are encountering!
+
+ 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/developer-experience-issue.md b/.github/ISSUE_TEMPLATE/developer-experience-issue.md
deleted file mode 100644
index b2ea8235eca..00000000000
--- a/.github/ISSUE_TEMPLATE/developer-experience-issue.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Developer experience issue
-about: Issues related to customization, extensibility, modularity
-title: ''
-labels: ''
-assignees: ''
-
----
-
-
-
-### Summary (*)
-
-
-### Examples (*)
-
-
-### Proposed solution
-
diff --git a/.github/ISSUE_TEMPLATE/developer-experience.yml b/.github/ISSUE_TEMPLATE/developer-experience.yml
new file mode 100644
index 00000000000..a234b5d5a27
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/developer-experience.yml
@@ -0,0 +1,32 @@
+name: 👀 Developer experience
+description: Issues related to customization, extensibility, modularity
+title: ""
+labels: ["review needed"]
+body:
+ - type: textarea
+ attributes:
+ label: Summary
+ description: Describe the issue you are experiencing. Include general information, error messages, environments, and so on.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Examples
+ description: Provide code examples or a patch with a test (recommended) to clearly indicate the problem.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Proposed solution
+ description: Suggest your potential solutions for this issue.
+ validations:
+ required: false
+ - type: textarea
+ attributes:
+ label: Anything else?
+ description: |
+ Links? References? Anything that will give us more context about the issue you are encountering!
+
+ 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/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index ace055663b7..00000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: New Feature
-assignees: ''
-
----
-
-
-
-### Description (*)
-
-
-### Expected behavior (*)
-
-
-### Benefits
-
-
-### Additional information
-
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000000..981c75faeec
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,39 @@
+name: 🚀 Feature request
+description: Suggest an idea or feature request
+title: "[FEAT] "
+labels: ["new feature", "review needed"]
+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
+ attributes:
+ label: Description
+ description: Describe the feature you would like to add.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Expected Behavior
+ description: What is the expected behavior of this feature? How is it going to work?
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Benefits
+ description: How do you think this feature would improve OpenMage?
+ validations:
+ required: false
+ - type: textarea
+ attributes:
+ label: Anything else?
+ description: |
+ Links? References? Anything that will give us more context about the issue you are encountering!
+
+ Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+ validations:
+ required: false