diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md
index bbc346ecbc..01e776fb92 100644
--- a/.gitlab/issue_templates/bug.md
+++ b/.gitlab/issue_templates/bug.md
@@ -1,19 +1,19 @@
-GIMP version:
+### Environment/Versions
+
+- GIMP version:
+- Package: <!--[flatpak? Installer from gimp.org? If another installer, tell us where from] (write it after the > symbol)-->
+- Operating System: <!--[Windows? macOS? Linux? All?] (write it after the > symbol) -->
 
 <!--Note: bug reporters are expected to have verified the bug still exists
 either in the last stable version of GIMP or on updated development code
 (master branch).-->
 
-Operating System: <!--[Windows? macOS? Linux? All?] (write it after the > symbol) -->
-
-Package: <!--[flatpak? Installer from gimp.org? If another installer, tell us where from] (write it after the > symbol)-->
-
-# Description of the bug
+### Description of the bug
 
 <!--Please describe your issue with details.
 Add screenshot or other files if needed.(write it after the > symbol)-->
 
-# Reproduction
+### Reproduction
 
 Is the bug reproducible? <!--[Always / Randomly / Happened only once ] (write it after the > symbol)-->
 
@@ -29,6 +29,6 @@ Expected result:
 
 Actual result:
 
-# Additional information
+### Additional information
 
 If you have a backtrace for a crash or a warning, paste it here.
diff --git a/.gitlab/issue_templates/feature.md b/.gitlab/issue_templates/feature.md
index 8276893459..f06a432a25 100644
--- a/.gitlab/issue_templates/feature.md
+++ b/.gitlab/issue_templates/feature.md
@@ -1,6 +1,6 @@
-Operating System: <!--[Windows? macOS? Linux? All?] (write it after the > symbol) -->
+**Operating System:** <!--[Windows? macOS? Linux? All?] (write it after the > symbol) -->
 
-# Description of the feature
+### Description of the feature
 
 <!-- Please describe your feature with details.
 
@@ -9,7 +9,7 @@ understanding the feature or for implementation.
 Also add links when needed, for instance for implementation standards
 or other relevant resources.-->
 
-# Use cases
+### Use cases
 
 <!-- If not obvious, explain the use cases or problems to solve. -->
 
diff --git a/.gitlab/issue_templates/performance.md b/.gitlab/issue_templates/performance.md
index 7c5ab33a10..080ca1e49c 100644
--- a/.gitlab/issue_templates/performance.md
+++ b/.gitlab/issue_templates/performance.md
@@ -1,33 +1,33 @@
-GIMP version:
+### Environment/Versions
+
+- GIMP Version:
+- Package: <!--[flatpak? Installer from gimp.org? If another installer, tell us where from] (write it after the > symbol)-->
+- Operating System: <!--[Windows? macOS? Linux? All?] (write it after the > symbol) -->
 
 <!-- Note: bug reporters are expected to have verified the bug still exists
 either in the last stable version of GIMP or on updated development code
 (master branch). -->
 
-Operating System: <!--[Windows? macOS? Linux? All?] (write it after the > symbol) -->
-
-Package: <!--[flatpak? Installer from gimp.org? If another installer, tell us where from] (write it after the > symbol)-->
-
-# Issue Description
+### Issue Description
 
 <!-- Please provide a general description of the issue. -->
 
-# Performance Log
+### Performance Log
 
 <!-- Please record a performance log demonstrating the issue, and attach it to the report.
-See
+For more information, see
 
   https://gitlab.gnome.org/GNOME/gimp/blob/master/devel-docs/performance-logs/performance-logs.md
 
-for more information.-->
+-->
 
-# Performance Log Description
+### Performance Log Description
 
 <!-- Please describe in detail the actions performed in the performance log.
 If you added empty event markers to the log, please provide a description for them here.
 If you recorded a screencast while recording the log, please attach it here.  -->
 
-# Additional Information
+### Additional Information
 
 <!-- If there is any additional information, please provide it here. -->