diff --git a/.github/ISSUE_TEMPLATE/issue-template.md b/.github/ISSUE_TEMPLATE/issue-template.md
index f9a8f47e63d..599e4a80b64 100644
--- a/.github/ISSUE_TEMPLATE/issue-template.md
+++ b/.github/ISSUE_TEMPLATE/issue-template.md
@@ -8,12 +8,11 @@ assignees: ''
 
 **Jetty version:**
 
-**OS version:**
-
 **Java version:**
 
+**OS/Type version:**
+
 **Description:**
 
-**Steps to reproduce:**
 
 
diff --git a/.github/ISSUE_TEMPLATE/question-template.md b/.github/ISSUE_TEMPLATE/question-template.md
index 1df32187976..43b01ee18f1 100644
--- a/.github/ISSUE_TEMPLATE/question-template.md
+++ b/.github/ISSUE_TEMPLATE/question-template.md
@@ -9,8 +9,6 @@ assignees: ''
 
 **Jetty version:**
 
-**OS version:**
-
 **Java version:**
 
 **Question:**