diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index ee15898..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: "[Bug]"
-labels: bug
-assignees: ''
-
----
-
-**Describe the Bug**
-Provide a clear and concise description of what the bug is, and what should have happened.
-
-**Steps to Reproduce**
-Steps to reproduce the behavior (Err on over-descriptive).
-
-**Additional Information**
-If applicable, include screenshots, OS/Browser/Build version, or any other relevant information.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..260c8c2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,45 @@
+name: Bug report
+description: Create a report to help us improve
+title: '[Bug] '
+body:
+  - type: textarea
+    id: describe
+    attributes:
+      label: Describe the Bug
+      description: >-
+        Provide a clear and concise description of what the bug is, and what
+        should have happened.
+      placeholder: Required
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to Reproduce
+      description: Steps to reproduce the behavior (Err on over-descriptive).
+      placeholder: Required
+    validations:
+      required: true
+  - type: textarea
+    id: info
+    attributes:
+      label: Additional Information
+      description: >-
+        If applicable, include screenshots, OS/Browser/Build version, or any
+        other relevant information.
+      placeholder: Required
+    validations:
+      required: true
+  - type: checkboxes
+    id: conduct
+    attributes:
+      label: Code of Conduct
+      description: ' submitting this issue, you agree to follow our [Code of Conduct](https://github.com/FlamedDogo99/EaglerMobile/blob/main/.github/CODE_OF_CONDUCT.md). '
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true
+  - type: markdown
+    attributes:
+      value: >-
+        This template was generated with [Issue Forms
+        Creator](https://issue-forms-creator.netlify.app)