diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 4cdc95a4c0..984d8bf120 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,5 +1,5 @@
-name: Bug Report
-description: Create a report to help us improve
+name: Chart Bug Report
+description: Report a bug in a Helm chart
 title: "[name of the chart e.g. grafana] Issue Title"
 labels: [bug]
 assignees:
@@ -9,6 +9,7 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this bug report! Please be cautious with the sensitive information/logs while filing the issue.
+
   - type: textarea
     id: desc
     attributes:
@@ -24,6 +25,7 @@ body:
       placeholder: Copy paste the entire output of the above
     validations:
       required: true
+
   - type: input
     id: kubectl-version
     attributes:
@@ -84,7 +86,7 @@ body:
     attributes:
       label: Enter the changed values of values.yaml?
       description: Please enter only values which differ from the defaults. Enter `NONE` if nothing's changed.
-      placeholder: 'key: value'
+      placeholder: "key: value"
     validations:
       required: false
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index a5f67efef0..726ea8620e 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,5 +1,5 @@
-name: Feature request
-description: Suggest an idea for this project
+name: Chart Feature Request
+description: Suggest an improvement to a Helm chart
 title: "[name of the chart e.g. grafana] Issue Title"
 labels: [enhancement]
 assignees:
@@ -30,7 +30,7 @@ body:
     attributes:
       label: Is your feature request related to a problem ?
       description: Give a clear and concise description of what the problem is.
-      placeholder:  ex. I'm always frustrated when [...]
+      placeholder: ex. I'm always frustrated when [...]
     validations:
       required: true