diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
index e73e2a606e4d..da1453756eba 100644
--- a/.github/ISSUE_TEMPLATE/bug.yaml
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -1,18 +1,15 @@
----
-name: Bug Report
-about: Report a bug
-title: ''
+name: Bug
+description: Report a bug
 labels: bug
-assignees: ''
+body: 
+- type: markdown
+  attributes: |
+    **Observed Behavior**:
 
----
+    **Expected Behavior**:
 
-**Observed Behavior**:
+    **Reproduction Steps** (Please include YAML):
 
-**Expected Behavior**:
-
-**Reproduction Steps** (Please include YAML):
-
-**Versions**:
-- Chart Version: 
-- Kubernetes Version (`kubectl version`): 
\ No newline at end of file
+    **Versions**:
+    - Chart Version: 
+    - Kubernetes Version (`kubectl version`): 
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/documentation.yaml
index 1bf88b080938..3532e748a263 100644
--- a/.github/ISSUE_TEMPLATE/documentation.yaml
+++ b/.github/ISSUE_TEMPLATE/documentation.yaml
@@ -1,10 +1,7 @@
----
 name: Documentation
-about: How the docs be improved?
-title: ''
+description: How the docs be improved?
 labels: documentation
-assignees: ''
-
----
-
-**How can the docs be improved?**
\ No newline at end of file
+body: 
+- type: markdown
+  attributes: |
+    **How can the docs be improved?**
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index a06d15cd814f..ec600bdfc0fe 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -1,12 +1,9 @@
----
 name: Feature
-about: Suggest an idea for a new feature
-title: ''
+description: Suggest an idea for a new feature
 labels: feature
-assignees: ''
+body: 
+- type: markdown
+  attributes: |
+    **What problem are you trying to solve?**
 
----
-
-**What problem are you trying to solve?**
-
-**How important is this feature to you?**
\ No newline at end of file
+    **How important is this feature to you?**
\ No newline at end of file