diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 5fb75ee1..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,42 +0,0 @@
-______________________________________________________________________
-
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
-______________________________________________________________________
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-
-1. Go to '...'
-1. Click on '....'
-1. Scroll down to '....'
-1. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
-
-- OS: \[e.g. iOS\]
-- Browser \[e.g. chrome, safari\]
-- Version \[e.g. 22\]
-
-**Smartphone (please complete the following information):**
-
-- Device: \[e.g. iPhone6\]
-- OS: \[e.g. iOS8.1\]
-- Browser \[e.g. stock browser, safari\]
-- Version \[e.g. 22\]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000..74c4f1b3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,68 @@
+name: "\U0001F41E Bug report"
+description: Report an issue with a Supabase Python Library
+labels: [bug]
+type: Bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for the contribution.
+
+        It is helpful to explain how to reproduce the bug and what the problem is.
+        If you have a small reproducible example, you can use the Reproduction field to provide it directly.
+        Otherwise, please provide a link to a repository or a gist (https://gist.github.com).
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+      placeholder: I am doing ... What I expect is ... What actually happening is ...
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Reproduction
+      description: Code snippet or URL to reproduce the bug.
+      placeholder: Reproduction URL
+      render: python
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction-steps
+    attributes:
+      label: Steps to reproduce
+      description: Please provide any reproduction steps that may need to be executed.
+      placeholder: Clone `my/example` repo then `uv run my-repro-script.py`
+  - type: dropdown
+    id: supabase-library
+    attributes:
+      label: Library affected
+      description: Select the library(s) that you think is affected by the bug
+      multiple: true
+      options:
+        - supabase-py
+        - supabase-auth
+        - supabase-functions
+        - postgrest
+        - realtime
+        - storage3
+        - other
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Library version
+      description: Version of all the libraries related in the problem.
+      placeholder: 'supabase 2.X.Y; postgrest 2.X.Y; ...'
+    validations:
+      required: true
+  - type: input
+    id: system-info
+    attributes:
+      label: Python version
+      description: Output of `python -V`
+      placeholder: 'python 3.X.Y'
+    validations:
+      required: true
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index de0e1945..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,21 +0,0 @@
-______________________________________________________________________
-
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
-______________________________________________________________________
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when \[...\]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000..500aedec
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,34 @@
+name: "\U0001F680 New feature proposal"
+description: Propose a new feature to be added to the Supabase Python Libraries
+labels: ['enhancement']
+type: Feature
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for your interest in the project and taking the time to fill out this feature report!
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Description
+      description: 'Clear and concise description of the problem. Please make the reason and use cases as detailed as possible. If you intend to submit a PR for this issue, link it here.'
+      placeholder: I believe a good addition to the library would be ...
+    validations:
+      required: true
+  - type: textarea
+    id: suggested-solution
+    attributes:
+      label: Suggested solution
+      description: 'In the library [xy] we could provide following implementation...'
+    validations:
+      required: true
+  - type: textarea
+    id: alternative
+    attributes:
+      label: Alternatives
+      description: Clear and concise description of any alternative solutions or features you've considered.
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Any other context or screenshots about the feature request here.