diff --git a/.gitlab/issue_templates/general-bug-or-issue.md b/.gitlab/issue_templates/general-bug-or-issue.md
deleted file mode 100644
index 94fe5590c9f4..000000000000
--- a/.gitlab/issue_templates/general-bug-or-issue.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Overview:
-----------------------------------------
-_Please describe your issue in detail._
-
-Reproduction steps:
-----------------------------------------
-1. Click on **Contacts -> New Individual**.
-1. Entered **First Name** and **Last Name** and clicked **Save**.
-1. Got an error "**Fatal error: DB error**".
-
-```(Please include the full text of the error message. You can remove any private information like passwords. If you put it inside three backtick ` symbols it will wrap/format it nicely!)```
-
-Current behaviour:
-----------------------------------------
-_What happens currently. Please provide screenshots or gifs ([LICEcap](http://www.cockos.com/licecap/), [SilentCast](https://github.com/colinkeenan/silentcast)) where appropriate._
-
-Expected behaviour:
-----------------------------------------
-_What should happen. Please provide screenshots or gifs ([LICEcap](http://www.cockos.com/licecap/), [SilentCast](https://github.com/colinkeenan/silentcast)) where appropriate._
-
-Environment information:
-----------------------------------------
-
-<!-- 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:__ _5.5/5.7/10.3/10.4/..._
-* __Web Server:__ _Apache/LiteSpeed/Nginx/..._
-
-Comments
-----------------------------------------
-_Anything else you would like the reviewer to note_
diff --git a/.gitlab/issue_templates/improvement.md b/.gitlab/issue_templates/improvement.md
new file mode 100644
index 000000000000..3f8e98a76667
--- /dev/null
+++ b/.gitlab/issue_templates/improvement.md
@@ -0,0 +1,20 @@
+Overview
+----------------------------------------
+_Please describe your improvement in detail._
+
+Example use-case
+----------------------------------------
+1. Click on **Contacts -> New Individual**.
+1. Enter **First Name** and **Last Name** and click **Save**.
+
+Current behaviour
+----------------------------------------
+_What is currently possible? What limit ?_
+
+Proposed behaviour
+----------------------------------------
+_What should happen? How is this better? If appropriate/available, include any wireframes or mockups._
+
+Comments
+----------------------------------------
+_Anything else you would like the reviewer to note._
diff --git a/.gitlab/issue_templates/problem.md b/.gitlab/issue_templates/problem.md
new file mode 100644
index 000000000000..6e911e9a05f7
--- /dev/null
+++ b/.gitlab/issue_templates/problem.md
@@ -0,0 +1,40 @@
+Overview
+----------------------------------------
+_Please describe your problem or bug in detail._
+
+Reproduction steps
+----------------------------------------
+1. Click on **Contacts -> New Individual**.
+1. Entered **First Name** and **Last Name** and clicked **Save**.
+1. Got an error "**Fatal error: DB error**".
+
+Current behaviour
+----------------------------------------
+_What happens currently. Please provide error messages, screenshots or gifs ([LICEcap](http://www.cockos.com/licecap/), [SilentCast](https://github.com/colinkeenan/silentcast)) where appropriate._
+
+```
+TIP: The best way to convey an error message is to copy it in here and use
+three backtick ` symbols.  You may edit the message to remove private
+information (like passwords). The backticks will help to preserve any
+special characters or spaces.
+```
+
+Expected behaviour
+----------------------------------------
+_What should happen._
+
+Environment information
+----------------------------------------
+
+<!-- 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:__ _Firefox 59.0.1/Chrome 78.0.3904/Safari 13_
+* __CiviCRM:__ _Master/5.20.0/5.19.1/5.18.2/..._
+* __PHP:__ _7.0/7.1/7.2/7.3/...__
+* __CMS:__ _Backdrop 1.5/Drupal 7.30/Joomla 3.3/WordPress 4.5/..._
+* __Database:__ _MySQL 5.7.7/MariaDB 10.4/..._
+* __Web Server:__ _Apache 2.4/Nginx 1.16/..._
+
+Comments
+----------------------------------------
+_Anything else you would like the reviewer to note._