diff --git a/.gitlab/issue_templates/general.md b/.gitlab/issue_templates/general-bug-or-issue.md
similarity index 72%
rename from .gitlab/issue_templates/general.md
rename to .gitlab/issue_templates/general-bug-or-issue.md
index 4850b3afe027..a38d056451fe 100644
--- a/.gitlab/issue_templates/general.md
+++ b/.gitlab/issue_templates/general-bug-or-issue.md
@@ -21,12 +21,15 @@ _What should happen. Please provide screenshots or gifs ([LICEcap](http://www.co
 Environment information:
 ----------------------------------------
 
-* __Web Server:__ _Apache/LiteSpeed/Nginx/Other_  
-* __CiviCRM Version:__ _Master_
-* __CMS:__ _Backdrop/Drupal/Joomla!/WordPress_
-* __CMS Version:__ _1.0_
+<!-- Some of the items below may not be relevant for every bug - if in doubt please include more information than you think is neccessary. -->
+
+* __Browser & Version:__ _Firefox 59.0.1/Chrome 78.0.3904/Safari 13_
+* __CiviCRM Version:__ _Master/5.20.0/5.19.1/5.18.2/..._
+* __CMS:__ _Backdrop/Drupal/Joomla/WordPress_
+* __CMS Version:__ _1.0/4.5/6.10/7.30/..._
 * __Database:__ _MariaDB/MySQL/Percona/Other_
-* __Database Versions:__ _10.4_
+* __Database Versions:__ _5.5/5.7/10.3/10.4/..._
+* __Web Server:__ _Apache/LiteSpeed/Nginx/..._
 
 Comments
 ----------------------------------------