diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index 36416e9aa1..0000000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**What steps did you take and what happened:**
-[A clear and concise description of what the bug is.]
-
-
-**What did you expect to happen:**
-
-
-**Anything else you would like to add:**
-[Miscellaneous information that will assist in solving the issue.]
-
-
-**Environment:**
-
-- Eraser version:
-- Kubernetes version: (use `kubectl version`):
\ 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 0000000000..e5a9adcdef
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,43 @@
+name: Bug Report
+description: Report a bug in Eraser
+title: "[BUG] <title>"
+labels:
+  - "bug"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please search to see if an issue already exists for your bug before continuing.
+        > If you need to report a security issue please see https://github.com/eraser-dev/eraser/security/policy instead.
+  - type: input
+    attributes:
+      label: Version of Eraser
+      placeholder: Release version (e.g. v1.0.0) or `git describe --dirty` output if built from source
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: Briefly describe what you expect to happen.
+  - type: textarea
+    attributes:
+      label: Actual Behavior
+      description: Briefly describe what is actually happening.
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Detailed steps to reproduce the behavior.
+      placeholder: |
+        1. In Kubernetes v1.27.0 ...
+        2. With this config...
+        3. Run '...'
+        4. See error...
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out a bug report!
+  - type: checkboxes
+    id: idea
+    attributes:
+      label: "Are you willing to submit PRs to contribute to this bug fix?"
+      description: "This is absolutely not required, but we are happy to guide you in the contribution process especially when you already have a good proposal or understanding of how to implement it. Join us at the `#eraser` channel on the [Kubernetes Slack](https://kubernetes.slack.com/archives/C03Q8KV8YQ4) if you have any questions."
+      options:
+        - label: Yes, I am willing to implement it.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
deleted file mode 100644
index 20173dee70..0000000000
--- 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: enhancement
-assignees: ''
-
----
-
-**Describe the solution you'd like**
-[A clear and concise description of what you want to happen.]
-
-
-**Anything else you would like to add:**
-[Miscellaneous information that will assist in solving the issue.]
-
-
-**Environment:**
-
-- Eraser version:
-- Kubernetes version: (use `kubectl version`):
\ 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 0000000000..ddc8e5c8da
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,35 @@
+name: Request
+description: Request a new feature or propose an enhancement to Eraser
+title: "[REQ] <title>"
+labels:
+  - "enhancement"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please search to see if an issue already exists for your request before continuing.
+  - type: dropdown
+    attributes:
+      label: What kind of request is this?
+      multiple: false
+      options:
+        - New feature
+        - Improvement of existing experience
+        - Other
+  - type: textarea
+    attributes:
+      label: What is your request or suggestion?
+      placeholder: |
+        e.g. I would like Eraser to add this <feature> so that I can use it in my <scenario>.
+        e.g. When using Eraser the <current behavior> has this <limitation> and it would be better if it has this <improvement>.
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out a request!
+  - type: checkboxes
+    id: idea
+    attributes:
+      label: "Are you willing to submit PRs to contribute to this feature request?"
+      description: "This is absolutely not required, but we are happy to guide you in the contribution process especially when you already have a good proposal or understanding of how to implement it. Join us at the `#eraser` channel on the [Kubernetes Slack](https://kubernetes.slack.com/archives/C03Q8KV8YQ4) if you have any questions."
+      options:
+        - label: Yes, I am willing to implement it.