diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 28e6f37..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: "[BUG] "
-labels: bug
-assignees: ''
-
----
-
-## Problem Description
-
-**Summary**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Device**
-What device(s) exhibit this behavious
-
-## Additional context
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 0000000..8afc085
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,68 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: (Enter short, one sentence summary of bug here)"
+labels: ["Bug / Error"]
+assignees:
+  - Codezilla-Club
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+        
+  - type: checkboxes
+    id: no-issues-relating-to-this
+    attributes:
+      label: Duplicate Issues
+      description: Check to make sure there are no existing posts about your problem in the 'issues' section.
+      options:
+        - label: There are **no existing posts relating to my problem**
+          required: true
+        - label: There are **existing posts relating to my problem, but the solution given, doesn't work for me.**
+          required: false       
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell me, what did you expect to happen?
+      placeholder: Tell me what you see!
+      value: "Well, I was trying to ... but then ..."
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to reproduce
+      description: This will allow me to figure out where the issue originates.
+      placeholder: Step 1, Step 2, Step 3...
+      value: |
+             1. 
+             2. 
+             3. 
+    validations:
+      required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you seeing this problem on?
+      description: Sometimes, problems can be platform-specific.
+      multiple: false
+      options:
+        - Windows
+        - MacOS
+        - Linux (can also be ChromeOS)
+        - iPhone
+        - Android
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Copy and paste from tracebacks, aka any error message text that appears in the console
+      render: shell
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: (Screenshots can be uploaded by simply dragging an image file into this box)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index a143709..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[FEAT] "
-labels: enhancement
-assignees: ''
-
----
-
-## Feature Description
-
-**Summary:**
-
-**Screenshots:**
-
-## Proposed Method
-
-**Summary:**
-
-## Additional context
-Add any other context or screenshots about the feature request here.
-
-- [ ] I want to work on this
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 0000000..13af4cd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,30 @@
+name: Bug Report
+description: Suggest an idea for this project
+title: [FEAT]: (Enter short, one sentence summary of feature here)"
+labels: ["enhancement"]
+assignees:
+  - Codezilla-Club
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+  - type: textarea
+    id: addition
+    attributes:
+      label: Summary
+      description: Summary of the Feature you want to add.
+    validations:
+      required: true
+  - type: textarea
+    id: proposed-method
+    attributes:
+      label: Proposed Method
+      description: Proposed Method of the feature you want to add.
+    validations:
+      required: true     
+      - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: (Screenshots can be uploaded by simply dragging an image file into this box)