diff --git a/.github/ISSUE_TEMPLATE/bug-report-or-feature-request.md b/.github/ISSUE_TEMPLATE/bug-report-or-feature-request.md
index 41248a749..6f0650ae9 100644
--- a/.github/ISSUE_TEMPLATE/bug-report-or-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/bug-report-or-feature-request.md
@@ -1,16 +1,16 @@
 ---
-name: Bug report or Feature request
+name: Bug report
 about: Create a report to help us improve
-title: 'Bug report or Feature request'
+title: '[Bug report] please put your title here'
 labels: ''
 assignees: ''
 
 ---
 
 **Describe the bug**
-A clear and concise description of what the bug is and how to reproduce it. If you think it is helpful, you can also talk about the expected behaviour. If applicable, add screenshots to help explain your problem.
+Describe the bug, and paste the executed code and the resulting output. If you think it is helpful, you can also talk about the expected behaviour. If applicable, add screenshots to help explain the problem.
 
 **Your System (please complete the following information):**
  - Operating system: [e.g. macOS 10.15.4, Windows 10, ...]
- - COCO version: [e.g. 2.2.1, from the `development` branch, ...]
+ - COCO version: [e.g. 2.2.1 (according to `cocopp.__version__`), from the `development` branch, ...]
  - Browser (if relevant): [e.g. chrome, safari]
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
new file mode 100644
index 000000000..cb5f2212c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -0,0 +1,8 @@
+---
+name: Generic Issue
+about: Create an issue to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
diff --git a/.github/ISSUE_TEMPLATE/submit-a-coco-data-set.md b/.github/ISSUE_TEMPLATE/submit-a-coco-data-set.md
index cb6c86302..009b508ba 100644
--- a/.github/ISSUE_TEMPLATE/submit-a-coco-data-set.md
+++ b/.github/ISSUE_TEMPLATE/submit-a-coco-data-set.md
@@ -9,13 +9,16 @@ assignees: brockho
 
 Hello COCO user!
 
-If you would like to submit one or several COCO data sets to the official COCO archive (https://coco.gforge.inria.fr/doku.php?id=algorithms), here is the right place to do. Please provide the information requested below and we will look at your submission timely and add everything to the archive if we see no technical problems. Before, we kindly ask you to read about any details in our [How to publish a dataset documentation](https://github.com/numbbo/coco/blob/development/howtos/publish-a-dataset-howto.md).
+Here is the right place to submit one or several COCO data sets to the official COCO archive (https://coco.gforge.inria.fr/doku.php?id=algorithms). Please provide the information requested below and submit the issue. Before, we kindly ask you to read about the details in our [How to publish a dataset documentation](https://github.com/numbbo/coco/blob/development/howtos/publish-a-dataset-howto.md).
 
-#### Link to Data
-[Please upload your COCO data and provide the link here. If you want to submit more than one data set at the same time, please explain which files corresponds to which algorithm.]
+#### Reference
+[Put the full reference (for citations) and a link to the pdf here.]
 
 #### Description of the Algorithm(s)
-[Please provide a description of all algorithms in the above data archive in form of a pdf. Peer-reviewed papers are preferred, but we are also okay if the description is put on arXiv or other web resources.]
+[Please provide a short description for each algorithm in the data.]
+
+#### Link to Data
+[Please upload your COCO data and provide the link here. If you want to submit more than one data set at the same time, please explain which files corresponds to which algorithm.]
 
 #### Potentially: Source Code of Experiment
 [We are happy to also share any source code of the algorithm and the COCO experiment, you were running. Please provide, if you wish, any data, link, etc. here]