diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index de1f0c1..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: Danz-maveRICK
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. New PCF or Edit PCF function?
-2. Click on '....'
-3. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. Win10]
- - XrmToolbox Version
- - PCF Custom Control Builder Version
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index bbcbbe7..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/issue-form-bug.yaml b/.github/ISSUE_TEMPLATE/issue-form-bug.yaml
new file mode 100644
index 0000000..a052d08
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue-form-bug.yaml
@@ -0,0 +1,45 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: [bug, triage]
+assignees:
+  - Power-Maverick
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: input
+    id: contact
+    attributes:
+      label: Contact Details
+      description: How can we get in touch with you if we need more info?
+      placeholder: ex. email@example.com
+    validations:
+      required: false
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: What version of the tool are you using?
+      description: You can find it under `Tool Library` in XrmToolBox.
+    validations:
+      required: true
+  - type: input
+    id: xrmtoolbox
+    attributes:
+      label: What version of XrmToolBox are you running?
+      description: You can find it under `Help` > `About XrmToolBox` in XrmToolBox.
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
diff --git a/.github/ISSUE_TEMPLATE/issues-form-feature-request.yaml b/.github/ISSUE_TEMPLATE/issues-form-feature-request.yaml
new file mode 100644
index 0000000..bf49822
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issues-form-feature-request.yaml
@@ -0,0 +1,47 @@
+name: Feature Request
+description: Suggest an idea for this project
+title: "[Feature]: "
+labels: [enhancement, triage]
+assignees:
+  - Power-Maverick
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to provide an enhancement idea for the tool!
+  - type: input
+    id: contact
+    attributes:
+      label: Contact Details
+      description: How can we get in touch with you if we need more info?
+      placeholder: ex. email@example.com
+    validations:
+      required: false
+  - type: dropdown
+    id: is-problem
+    attributes:
+      label: Is your feature request related to a problem?
+      options:
+        - 'Yes'
+        - 'No'
+    validations:
+      required: true
+  - type: textarea
+    id: problem
+    attributes:
+      label: Describe the problem?
+    validations:
+      required: false
+  - type: textarea
+    id: solution
+    attributes:
+      label: Provide a solution or an idea you would like to see in the tool?
+      description: Also if you can provide any alternatives you have considered that would be great!
+    validations:
+      required: false
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell