diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.md b/.github/ISSUE_TEMPLATE/01_bug_report.md
deleted file mode 100644
index a29d358b..00000000
--- a/.github/ISSUE_TEMPLATE/01_bug_report.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-name: '🐛 Bug report'
-about: Something not working as expected
-label: 'Bug'
----
-
-## Current behavior
-
-<!--
-  Describe the issue.
-
-  If you're using Expo, please check their forums for a similar issue
-  first: https://forums.expo.io/
--->
-
-## Expected behavior
-
-<!-- Describe what the desired behavior would be. -->
-
-## Repro steps
-
-<!--
-  - Please provide step-by-step instructions on how to reproduce the issue.
-  - Better yet, provide a repo/branch where the issue is easily reproducible.
--->
-
-## Environment
-
-- **Platforms tested**:
-  - [ ] Android
-  - [ ] iOS
-  - [ ] macOS
-  - [ ] Windows
-- **AsyncStorage version**: <!-- @react-native-async-storage/async-storage version set in package.json -->
-- **Expo version**: <!-- If you use Expo, please specify its version here -->
-- **Environment**:
-  <!--
-    After running `npm install` or `yarn` in your repo, run `npx react-native info`
-    and paste the output here.
-  -->
-- **Logs/Errors that may be relevant**: <!-- link to your CI logs or semantic-release logs -->
diff --git a/.github/ISSUE_TEMPLATE/02_feature_request.md b/.github/ISSUE_TEMPLATE/02_feature_request.md
deleted file mode 100644
index 345fd1bc..00000000
--- a/.github/ISSUE_TEMPLATE/02_feature_request.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: '🔧 Feature request'
-about: New functionality for Async Storage
-label: 'Enhancement'
----
-
-## Motivation
-
-<!-- Describe the context, the use-case and the advantages of the feature request. -->
-
-## Description
-
-<!-- Describe the functional changes that would have to be made -->
-
-## New feature implementation
-
-<!-- Optionally, describe the technical changes to be made -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/03_question_discussion.md b/.github/ISSUE_TEMPLATE/03_question_discussion.md
deleted file mode 100644
index d2c01e68..00000000
--- a/.github/ISSUE_TEMPLATE/03_question_discussion.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: '🗣 Have a question / start a discussion'
-about: You want to ask or discuss something
-label: 'Question/Discussion'
----
-
-## You want to:  
-<!-- Ask question / Discuss something -->
-
-## Details:
-<!-- Place for your question/discussion -->
\ 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..f71501cb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,53 @@
+name: "Bug report \U0001F41B"
+description: File a bug report
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |-
+        Thanks for taking the time to fill out this bug report!
+
+        If you're using Expo, please check their forums for a similar issue first: https://forums.expo.io/
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: What did you expect to happen? Can you attach build logs? Can you attach screenshots?
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version of `@react-native-async-storage/async-storage` are you using?
+      placeholder: "Example: 1.15.9"
+    validations:
+      required: true
+  - type: checkboxes
+    id: platforms
+    attributes:
+      label: What platforms are you seeing this issue on?
+      description: "Select all that apply:"
+      options:
+        - label: Android
+        - label: iOS
+        - label: macOS
+        - label: Windows
+        - label: web
+  - type: textarea
+    id: system-info
+    attributes:
+      label: System Information
+      placeholder: Run `npx react-native info` and paste the output here.
+      render: true
+    validations:
+      required: true
+  - type: textarea
+    id: repro-steps
+    attributes:
+      label: Steps to Reproduce
+      description: Tell us how to reproduce this issue, or provide a minimal demo where your issue can be easily reproduced.
+      placeholder: Tell us how to reproduce this issue.
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000..f50f958b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,30 @@
+name: "Feature request \U0001F4A1"
+description: Suggest an idea for this project
+labels: [enhancement]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+  - type: textarea
+    id: proposal
+    attributes:
+      label: Proposal
+      description: Provide a clear and concise description of your motivation for this proposal (e.g. \"I'm always frustrated when…\"), and what you want to happen instead.
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives
+      description: Provide a clear and concise description of any alternative solutions or features you've considered.
+  - type: textarea
+    id: implementation
+    attributes:
+      label: Implementation Details
+      description: Provide a clear and concise description of how you think this could be implemented.
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description: Add any other context or screenshots about the feature request here.