diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/01_bug_report.md
similarity index 50%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/01_bug_report.md
index c04a8d54..3d3efe45 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.md
@@ -13,40 +13,49 @@ assignees: ''
 The bug is...
 
 
-## What version of the chart are you using?
+## What version of the chart?
 
 I am using version `X.X.X` of this chart.
 
 
-## What version of Kubernetes are you using?
+## What version of Kubernetes?
 
 ```console
-######## PASTE `kubectl version` BELOW ########
+
+# output of `kubectl version` command
 Client Version: ...
 Server Version: ...
-######## PASTE `kubectl version` ABOVE ########
+
 ```
 
 
-## What version of Helm are you using?
+## What version of Helm?
 
 ```console
-######## PASTE `helm version` BELOW ########
+
+# output of `helm version` command
 version.BuildInfo{....
-######## PASTE `helm version` ABOVE ########
+
 ```
 
 
-## What are your custom helm values?
+## Any non-default Helm values?
 
 <details>
 <summary>click to expand</summary>
 
 ```yaml
-######## PASTE values.yaml BELOW ########
-airflow:
+## PASTE BELOW THIS LINE
+## --------------------------------------------------
+
+## non-default helm values (in YAML format)
+airflow: 
+  ...
+workers: 
   ...
-######## PASTE values.yaml ABOVE ########
+  
+## --------------------------------------------------
+## PASTE ABOVE THIS LINE
 ```
 
 </details>
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/02_feature_request.md
similarity index 87%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to .github/ISSUE_TEMPLATE/02_feature_request.md
index 394cfe5c..f7b011d2 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/02_feature_request.md
@@ -8,12 +8,11 @@ assignees: ''
 
 <!-- ⚠️ BEFORE you submit an issue, please check if a similar issue already exists -->
 
-
 ## What is your feature request?
 
 I would like the chart to...
 
 
-## What alternatives have you considered?
+## Have you considered any alternatives?
 
 Alternatively the chart could...
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/03_question.md
similarity index 99%
rename from .github/ISSUE_TEMPLATE/question.md
rename to .github/ISSUE_TEMPLATE/03_question.md
index 42836b7d..3786c274 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/03_question.md
@@ -8,7 +8,6 @@ assignees: ''
 
 <!-- ⚠️ BEFORE you submit an issue, please check if a similar issue already exists -->
 
-
 ## What is your question?
 
 I would like to know...
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/04_documentation.md b/.github/ISSUE_TEMPLATE/04_documentation.md
new file mode 100644
index 00000000..50acacb9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/04_documentation.md
@@ -0,0 +1,13 @@
+---
+name: Documentation 
+about: Raise an issue that only relates to documentation.
+title: ''
+labels: 'documentation' 
+assignees: ''
+---
+
+<!-- ⚠️ BEFORE you submit an issue, please check if a similar issue already exists -->
+
+## What is your documentation issue?
+
+The documentation should...
\ No newline at end of file