diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 37056a1ce5..ec1b4a10fe 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -47,10 +47,11 @@ _Any other detail that may help to understand/debug the problem_
 
 ### Environment
 
-- Linux distribution and version (e.g. "Ubuntu 20.04" or "Arch Linux")
-- Firejail version (`firejail --version`).
+- Name/version/arch of the Linux kernel (`uname -srm`):
+- Name/version of the Linux distribution (e.g. "Ubuntu 20.04" or "Arch Linux"):
+- Version of Firejail (`firejail --version`):
 - If you use a development version of firejail, also the commit from which it
-  was compiled (`git rev-parse HEAD`).
+  was compiled (`git rev-parse HEAD`):
 
 ### Checklist
 
diff --git a/.github/ISSUE_TEMPLATE/build_issue.md b/.github/ISSUE_TEMPLATE/build_issue.md
index 7e0b822bbc..11be8fbdf2 100644
--- a/.github/ISSUE_TEMPLATE/build_issue.md
+++ b/.github/ISSUE_TEMPLATE/build_issue.md
@@ -64,9 +64,9 @@ _(Optional) Any other detail that may help to understand/debug the problem_
 
 ### Environment
 
-- Name/version/arch of the Linux kernel (e.g. the output of `uname -srm`)
-- Name/version of the Linux distribution (e.g. "Ubuntu 20.04" or "Arch Linux")
-- Name/version of the C compiler (e.g. "gcc 14.1.1-1")
-- Name/version of the libc (e.g. "glibc 2.40-1")
-- Version of the Linux API headers (e.g. "linux-api-headers 6.10-1" on Arch Linux)
-- Version of the source code being built (e.g. the output of `git rev-parse HEAD`)
+- Name/version/arch of the Linux kernel (`uname -srm`):
+- Name/version of the Linux distribution (e.g. "Ubuntu 20.04" or "Arch Linux"):
+- Name/version of the C compiler (e.g. "gcc 14.1.1-1"):
+- Name/version of the libc (e.g. "glibc 2.40-1"):
+- Version of the Linux API headers (e.g. "linux-api-headers 6.10-1" on Arch Linux):
+- Version of the source code being built (`git rev-parse HEAD`):
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index ce1b70e392..08a5678e27 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -22,3 +22,11 @@ _A clear and concise description of any alternative solutions or features you've
 ### Additional context
 
 _Add any other context or screenshots about the feature request here._
+
+### Environment
+
+- Name/version/arch of the Linux kernel (`uname -srm`):
+- Name/version of the Linux distribution (e.g. "Ubuntu 20.04" or "Arch Linux"):
+- Version of Firejail (`firejail --version`):
+- If you use a development version of firejail, also the commit from which it:
+  was compiled (`git rev-parse HEAD`):