diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index f1bf1bcf88..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
----
-
-**Integration Details (please complete the following information):**
-
-* SDK/Library version: <!-- Example: 4.18.0 -->
-* Environment: <!-- Is this issue in Sandbox or Production? -->
-* Android Version and Device: <!-- Example: Motorola Droid Razr Maxx with Android 4.4.2, Samsung S7 with Android 6.0 -->
-* Braintree dependencies:
-<!-- Examples -->
-<!--  - com.braintreepayments.api:braintree:x.y.z -->
-<!--  - compile 'com.braintreepayments.api:data-collector:2.+' -->
-<!--  - com.braintreepayments.api:visa-checkout:x.y.z-SNAPSHOT -->
-<!--  - com.braintreepayments.api:drop-in:x.y.z -->
-
-<!-- NOTE if you are creating an issue related to Drop-in, consider creating the issue in the Drop-in repository (https://github.com/braintree/braintree-android-drop-in/issues) -->
-
-**Describe the bug**
-Description of what the bug is. Please include as many details as possible.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. See error
-
-**Expected behavior**
-Description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-<!-- Do not reveal sensitive data. ex: credit card numbers & customer credentials -->
-
-<!-- NOTE: Please do not open an issue for translation requests for new languages. We support the same languages that are supported by PayPal, and have a dedicated localization team to provide translations.
-If there is an error in a specific translation, you may open an issue here and we will escalate it to our localization team. -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000000..5b31e5b2a5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,69 @@
+name: Bug report
+description: Create a report to help us improve
+body:
+- type: input
+  attributes:
+    label: Braintree SDK Version
+    placeholder: "e.g. 4.24.0"
+  validations:
+    required: true
+- type: dropdown
+  attributes:
+    label: Environment
+    options:
+      - Sandbox
+      - Production
+      - Both
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Android Version & Device
+    placeholder: "e.g Google Pixel 6a - Android 12.0"
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Braintree dependencies
+    placeholder: |
+      <!-- Examples -->
+      <!--  - com.braintreepayments.api:braintree:x.y.z -->
+      <!--  - compile 'com.braintreepayments.api:data-collector:2.+' -->
+      <!--  - com.braintreepayments.api:visa-checkout:x.y.z-SNAPSHOT -->
+      <!--  - com.braintreepayments.api:drop-in:x.y.z -->
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Describe the bug
+    description: Description of what the bug is. Please include as many details as possible.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: To reproduce
+    description: Steps to reproduce the behavior.
+    placeholder: |
+      1. Go to '...'
+      2. Click on '....'
+      3. See error
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Expected behavior
+    description: Description of what you expected to happen.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Screenshots
+    description: If applicable, add screenshots to help explain your problem.
+    placeholder: |
+      Do not reveal sensitive data. For example, credit card numbers & customer credentials.
+  validations:
+    required: false
+- type: markdown
+  attributes:
+    value: |
+      Note - Please do not open an issue for translation requests for new languages. We support the same languages that are supported by PayPal, and have a dedicated localization team to provide translations. If there is an error in a specific translation, you may open an issue here and we will escalate it to our localization team.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index b1b1d63622..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for our SDK
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is.
-
-**Describe the solution you'd like**
-Description of what you want to happen. Follow the [user story](https://en.wikipedia.org/wiki/User_story) format to clearly describe the use case.
-
-<!-- NOTE: Please do not open an issue for translation requests for new languages. We support the same languages that are supported by PayPal, and have a dedicated localization team to provide translations.
-If there is an error in a specific translation, you may file a bug report issue here and we will escalate it to our localization team. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000000..251420c803
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,17 @@
+name: Feature request
+description: Suggest an idea for our SDK
+body:
+- type: textarea
+  attributes:
+    label: Is your feature request related to a problem? Please describe.
+    description: A clear and concise description of what the problem is.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Describe the solution you'd like.
+    description: Description of what you want to happen.
+    placeholder: |
+      Follow the [user story](https://en.wikipedia.org/wiki/User_story) format to clearly describe the use case.
+  validations:
+    required: false