diff --git a/.gitlab/issue_templates/Bug Report.md b/.gitlab/issue_templates/Bug Report.md
new file mode 100644
index 00000000..c209b177
--- /dev/null
+++ b/.gitlab/issue_templates/Bug Report.md	
@@ -0,0 +1,29 @@
+# Description
+
+Please describe the issue.
+
+# Steps to Reproduce
+
+1. ...
+2. ...
+3. ...
+
+# Expected Behavior
+
+Please describe the expected behavior.
+
+# Actual Behavior
+
+Please describe the actual behavior.
+
+# Additional Details
+
+These are optional, please add them if it makes sense.
+
+- ![Screenshot]()
+- [Logfile]()
+- ...
+
+# Possible Solutions
+
+If you have any suggestions on how to solve the issue, please add them here.
diff --git a/.gitlab/issue_templates/Feature Request.md b/.gitlab/issue_templates/Feature Request.md
index f60644d2..d6dbe30b 100644
--- a/.gitlab/issue_templates/Feature Request.md	
+++ b/.gitlab/issue_templates/Feature Request.md	
@@ -1,9 +1,13 @@
-# Description
+# Story
 
 As a …, I want … so that …
 
+# Description
+
+Please add a more detailed description of the feature here.
+
 # Acceptance criteria
 
-* Criterion 1
-* Criterion 2
-* …
+1. Criterion 1
+2. Criterion 2
+3. …
diff --git a/README.md b/README.md
index 4222e363..9b502a47 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ npm test
 ## Contributing
 
 Code and content contributions are accepted. Please feel free to submit issues
-to the issue tracker or submit merge requests for code changes.
+to the issue tracker or submit merge requests for code changes. To create an issue send a mail to [git+dungeonslayers-ds4-155-issue-@git.f3l.de](mailto:git+dungeonslayers-ds4-155-issue-@git.f3l.de).
 
 ## Licensing