diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index b2c6843..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
-labels: bug
-assignees: ""
----
-
-<!-- Users should receive an incoming sound alert when a message is received
-instead of an outgoing sound alert. -->
-
-### Scenario
-
-<!-- - Log in to the chat application -->
-<!-- - Receive a message -->
-
-### Actual result
-
-<!-- The user receives an outgoing sound alert when a message is received -->
-
-### Expected result
-
-<!-- The user receives an incoming sound alert when a message is received -->
-
-### Acceptance criteria
-
-<!-- - [ ] Change sound assets from outgoing sound to incoming sound in receive
-message function -->
-
-- [ ]
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..212a11a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,42 @@
+name: Bug report
+description: Create a report to help us improve
+title: "bug: "
+labels: ["bug"]
+body:
+  - type: textarea
+    id: scenario
+    attributes:
+      label: Scenario
+      description: Describe the scenario in which you encountered the bug
+    validations:
+      required: true
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual result
+      description: Describe what actually happened
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected result
+      description: Describe what you expected to happen
+    validations:
+      required: true
+  - type: textarea
+    id: criteria
+    attributes:
+      label: Acceptance criteria
+      description: Describe the acceptance criteria(s) for this bug
+      value: |
+        - [ ]
+    validations:
+      required: true
+  - type: checkboxes
+    id: contribute
+    attributes:
+      label: Contribute
+      description: Would you like to fix this bug?
+      options:
+        - label: Yes
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 5d6f9fa..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: "Feature Request"
-about: Suggest a new idea for this project
-title: ""
-labels: feature
-assignees: ""
----
-
-<!-- As a user, I want to hear sound alerts when sending and receiving messages
-so conversations feel more immediate (and asynchronous)
-
-The previous description follows the following brief structure:
-
-As **[the actor]**, I want **[the something]** so I can **[the goal]**.
-
-    The actor — the person using the feature.
-    The something — what the user needs the feature for.
-    The goal — why the user needs it. -->
-
-### Acceptance Criteria
-
-<!-- This section is a checklist to confirm that the work done on a ticket meets the intended purpose and maps the deliverable into smaller outcomes
-
-- [ ] The outgoing sound alert is played when a message is sent.
-- [ ] The incoming sound alert is played when a message is received. -->
-
-- [ ]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..956219d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,29 @@
+name: Feature Request
+description: Suggest a new idea for this project
+title: "feat: "
+labels: ["feature"]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Describe the feature you are requesting
+      placeholder: "As **[the actor]**, I want **[the something]** so I can **[the goal]**"
+    validations:
+      required: true
+  - type: textarea
+    id: criteria
+    attributes:
+      label: Acceptance criteria
+      description: Describe the acceptance criteria(s) for this bug.
+      value: |
+        - [ ]
+    validations:
+      required: false
+  - type: checkboxes
+    id: contribute
+    attributes:
+      label: Contribute
+      description: Would you like to contribute to this feature?
+      options:
+        - label: Yes