diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 09d66d696..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ""
-labels: bug
----
-
-**1. Environment**
-
--   Device: [Pixel 6]
--   OS: [Android 13]
--   APP: [0.9.6]
-
-**2. Describe the bug**
-
-_(I may not respond in a timely manner, but you will be notified when this issue is resolved or refused to be resolved.)_
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..b326031ca
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,50 @@
+name: Bug Report
+description: Something is not working as expected? Let us know how we can fix it.
+labels: [ bug, untriaged ]
+body:
+
+- type: checkboxes
+  id: reproducible
+  attributes:
+    label: Checklist
+    options:
+      - label: This error does NOT cause the app to crash.
+        required: true
+      - label: I've already searched in [exising issues](https://github.com/Ashinch/ReadYou/issues?q=is%3Aissue+) and haven't found a similar problem reported.
+        required: true
+      - label: This error can be reproduced with the same action, feed or article.
+  
+- type: dropdown
+  id: types
+  attributes:
+    label: Which category best fits this error?
+    options:
+      - Feed Sync
+      - Feed Management
+      - User Interface
+      - Others
+  validations:
+    required: true
+
+- type: input
+  id: version
+  attributes:
+    label: App version
+  validations:
+    required: true
+    
+- type: textarea
+  id: repro
+  attributes:
+    label: Reproduction steps
+    description: "How can we reproduce this bug? Please specify the account type (local, Google Reader, etc.) and, if applicable, the link to the relevant feed or article."
+    value: |
+      1. 
+      2.
+      3.
+      ...
+    render: bash
+  validations:
+    required: true
+    
+    
diff --git a/.github/ISSUE_TEMPLATE/crash_report.yml b/.github/ISSUE_TEMPLATE/crash_report.yml
new file mode 100644
index 000000000..158dfec57
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/crash_report.yml
@@ -0,0 +1,38 @@
+name: Crash Report
+description: Tell us what happended when the app crashed or stopped working
+labels: [ bug, untriaged ]
+body:
+
+- type: checkboxes
+  id: reproducible
+  attributes:
+    label: Checklist
+    options:
+      - label: This error causes the app to crash.
+        required: true
+      - label: This error is consistently reproducible with the same action, feed or article.
+      
+- type: textarea
+  id: report
+  attributes:
+    label: Error report
+    description: "An error report page should appear after the app crashing. Please copy and paste the report here."
+    render: bash
+  validations:
+    required: true
+      
+- type: textarea
+  id: repro
+  attributes:
+    label: Reproduction steps
+    description: "How can we recreate this bug? Please specify the account type (local, Google Reader, etc.) and, if applicable, the link to the relevant feed or article."
+    value: |
+      1. 
+      2.
+      3.
+      ...
+    render: bash
+  validations:
+    required: true
+    
+    
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index e3edbda74..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ""
-labels: enhancement
----
-
-**1. Environment**
-
--   Device: [Pixel 6]
--   OS: [Android 13]
--   APP: [0.9.6]
-
-**2. Describe the feature request**
-
-_(I may not respond in a timely manner, but you will be notified when this issue is resolved or refused to be resolved.)_
\ 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 000000000..e35d0aa7b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,51 @@
+name: "Feature Request"
+description: Suggest a new feature for the app
+labels: [ enhancement, untriaged ]
+body:
+
+- type: checkboxes
+  id: checklist
+  attributes:
+    label: Checklist
+    options:
+      - label: I've already searched in [exising issues](https://github.com/Ashinch/ReadYou/issues?q=is%3Aissue+) and haven't found a similar feature request.
+        required: true
+
+  
+- type: dropdown
+  id: types
+  attributes:
+    label: Which category best fits this feature request?
+    options:
+      - Feed Sync & Management
+      - User Interface
+      - New API Integration
+      - Others
+  validations:
+    required: true
+
+
+- type: textarea
+  id: description_1
+  attributes:
+    label: Is your feature request related to a problem? Please describe.
+    description:
+    placeholder: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+  validations:
+    required: false
+- type: textarea
+  id: description_2
+  attributes:
+    label: Describe the solution you'd like
+    description:
+    placeholder: A clear and concise description of what you want to happen.
+  validations:
+    required: false
+- type: textarea
+  id: description_3
+  attributes:
+    label: Related links
+    description:
+    placeholder: Please provide links to the feed or article where this feature might be beneficial.
+  validations:
+    required: false