diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md
index c7fc7d6be3..bbc346ecbc 100644
--- a/.gitlab/issue_templates/bug.md
+++ b/.gitlab/issue_templates/bug.md
@@ -4,7 +4,7 @@ GIMP version:
 either in the last stable version of GIMP or on updated development code
 (master branch).-->
 
-Operating System: <!--[Windows? macOS? Linux?] (write it after the > symbol) --> 
+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)-->
 
diff --git a/.gitlab/issue_templates/feature.md b/.gitlab/issue_templates/feature.md
index 83c629c072..8276893459 100644
--- a/.gitlab/issue_templates/feature.md
+++ b/.gitlab/issue_templates/feature.md
@@ -1,15 +1,15 @@
-Operating System: (if feature is platform specific)
+Operating System: <!--[Windows? macOS? Linux? All?] (write it after the > symbol) -->
 
 # Description of the feature
 
-Please describe your feature with details.
+<!-- Please describe your feature with details.
 
 Add screenshots, design images or other files which would help for
 understanding the feature or for implementation.
 Also add links when needed, for instance for implementation standards
-or other relevant resources.
+or other relevant resources.-->
 
 # Use cases
 
-If not obvious, explain the use cases or problems to solve.
+<!-- 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 ed60b5e77d..7c5ab33a10 100644
--- a/.gitlab/issue_templates/performance.md
+++ b/.gitlab/issue_templates/performance.md
@@ -1,34 +1,34 @@
-GIMP Version:
+GIMP version:
 
-Note: bug reporters are expected to have verified the bug still exists
+<!-- 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).
+(master branch). -->
 
-Operating System:
+Operating System: <!--[Windows? macOS? Linux? All?] (write it after the > symbol) -->
 
-Package: [flatpak? Installer from gimp.org? If another installer, tell us where from]
+Package: <!--[flatpak? Installer from gimp.org? If another installer, tell us where from] (write it after the > symbol)-->
 
 # Issue Description
 
-Please provide a general description of the issue.
+<!-- Please provide a general description of the issue. -->
 
 # Performance Log
 
-Please record a performance log demonstrating the issue, and attach it to the report.
+<!-- Please record a performance log demonstrating the issue, and attach it to the report.
 See
 
   https://gitlab.gnome.org/GNOME/gimp/blob/master/devel-docs/performance-logs/performance-logs.md
 
-for more information.
+for more information.-->
 
 # Performance Log Description
 
-Please describe in detail the actions performed in the performance log.
+<!-- 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.
+If you recorded a screencast while recording the log, please attach it here.  -->
 
 # Additional Information
 
-If there is any additional information, please provide it here.
+<!-- If there is any additional information, please provide it here. -->
 
 /label ~"1. Performance"