diff --git a/.github/ISSUE_TEMPLATE/question-template.md b/.github/ISSUE_TEMPLATE/question-template.md
index d9cb028ca8b..a36ca9e1bbe 100644
--- a/.github/ISSUE_TEMPLATE/question-template.md
+++ b/.github/ISSUE_TEMPLATE/question-template.md
@@ -7,9 +7,12 @@ assignees: ''
 
 ---
 
-**Jetty version**
+**Jetty Version**
 
-**Java version**
+**Jetty Environment**
+<!-- Applicable only for jetty-12, choose: core, ee8, ee9, ee10 -->
+
+**Java Version**
 
 **Question**