diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 29c329dc..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior.
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Context:**
- - OS and version: [e.g. macOS 10.13.3]
- - OpenRNDR version
- - Java Version
-
-**Additional context**
-Add any other context about the problem here.
\ 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 00000000..25c9ffd2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,46 @@
+name: "Bug Report"
+description: Report an issue or possible bug
+title: ""
+labels: ["bug"]
+assignees: []
+body:
+  - type: markdown
+    attributes:
+      value: Thank you for taking the time to file a bug report! Please fill out this form as completely as possible.
+  - type: input
+    attributes:
+      label: Operating System
+      placeholder: Mac, Windows, Linux
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: OPENRNDR version
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: ORX version
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Java version
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the Bug
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to Reproduce
+      description: Describe the steps taken or paste/link a minimal code example that we can reproduce ourselves.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Screenshots (Optional)
+      description: Link or drag & drop images showcasing the bug.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index fdf90be7..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: Feature request
-about: Suggest an idea or general improvement.
-labels: "enhancement"
----
-
-**Is your feature request related to a problem?**
-<!-- A clear and concise description of what the problem is. -->
-
-
-**Describe the solution you'd like**
-<!-- A clear and concise description of what you want to happen. -->
-
-
-**Additional context**
-<!-- Add any other context or screenshots about the feature request here. -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000..ed6ebe19
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,54 @@
+name: "Feature Request"
+description: "Suggest an idea or general improvement."
+title: ""
+labels: ["enhancement"]
+assignees: []
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to suggest a new feature! Please fill out this form as completely as possible.
+  - type: textarea
+    attributes:
+      label: Motivation
+      description: |
+        A quick, clear and concise description of what the problem is.
+
+        **Please include links to relevant issues, Slack convos, and anything else.**
+      placeholder: I want to be able to...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Proposed Solution
+      description: Your take on one (or more) possible solution(s) to problem.
+      value: |
+        ### Possible solutions
+
+        ### Alternatives considered
+
+        ### Risks, downsides, and/or tradeoffs
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Detailed Design
+      description: |
+        🛑 **Just looking for feedback on an idea? Leave this section blank.**
+
+        Otherwise, explain the exact steps required to implement this change.
+        Include specific details that would help someone implement this feature.
+  - type: textarea
+    attributes:
+      label: Open Questions
+      description: |
+        Are there any open questions remaining? List them here.
+  - type: checkboxes
+    attributes:
+      label: Help make it happen!
+      description: "Feature requests with contributing authors are much more likely to get done!"
+      options:
+        - label: I am willing to submit a PR to implement this change.
+        - label: I am willing to submit a PR to implement this change, but would need some guidance.
+        - label: I am not willing to submit a PR to implement this change.
+    validations:
+      required: true
\ No newline at end of file