diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index cec36ab5..13e819d0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,40 +1,38 @@
 ---
 name: Bug report
-about: Create a report to help us improve
-title: ""
-labels: "bug"
-assignees: ""
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+about: Create a bug report to help us improve
+title: "[bug]"
+labels: bug
+assignees: ''
 
-**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.
+name: 🐛 Bug
+description: Submit a bug report to help us improve
+title: "🐛 Bug: "
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to fill out our bug report form 🙏
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A brief description of the bug. What happened? What did you expect to happen?
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      description: How do you trigger this bug? Please walk us through it step by step.
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: Please add screenshots if applicable
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 00000000..6071f7e9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,24 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+title: Feature Request
+labels: enhancement
+assignees: ''
+
+---
+
+name: 🚀 Feature Request
+description: Submit a proposal for a new feature or enhancement
+title: "🚀 Feature: "
+labels: ["feature"]
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to fill out our feature request form 🙏
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Description of the proposed feature or enhancement. Why should this be implemented?
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 9b90523f..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ""
-labels: "enhancement"
-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/question.md b/.github/ISSUE_TEMPLATE/question.md
index c52d5cdc..d809d698 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,11 +1,24 @@
 ---
 name: Question
 about: I have a question about this project
-title: ""
-labels: "question"
-assignees: ""
----
+title: Question
+labels: question
+assignees: ''
 
-**Description**
+---
 
-A brief description of the question or issue:
+name: ❓ Question
+description: Ask a question about the project
+title: "❓ Question: "
+labels: ["question"]
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to ask a question! 🙏
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Description of the question. What would you like to know?
+    validations:
+      required: true