diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 504d1f58..89eb9692 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -10,13 +10,14 @@
 3. {...}
 
 ## Context
+- UI5 Module Version *(output of `ui5 --version` when using the CLI)*: `{...}`
+- Node.js Version: `{...}`
+- npm Version: `{...}`
 - OS/Platform: {...}
-- Node.js Version: {...}
-- npm Version: {...}
 - Browser *(if relevant)*: {...}
 - Other information: {...}
 
-## Affected components
+## Affected components *(if known)*
 - [ ] [ui5-builder](https://github.com/SAP/ui5-builder)
 - [ ] [ui5-server](https://github.com/SAP/ui5-server)
 - [ ] [ui5-cli](https://github.com/SAP/ui5-cli)
@@ -24,7 +25,7 @@
 - [ ] [ui5-project](https://github.com/SAP/ui5-project)
 - [ ] [ui5-logger](https://github.com/SAP/ui5-logger)
 
-## Stack trace/log output
+## Log Output / Stack Trace
 ```
-{logs}
+{...}
 ```