diff --git a/.gitlab/issue_templates/Bug Report.md b/.gitlab/issue_templates/Bug Report.md
index 0f45b35..abb9624 100644
--- a/.gitlab/issue_templates/Bug Report.md	
+++ b/.gitlab/issue_templates/Bug Report.md	
@@ -1,35 +1,48 @@
-<!--
-SPDX-FileCopyrightText: 2021 Johannes Loher
+Your issue may already have been reported! Please search on the [issue tracker](https://git.f3l.de/dungeonslayers/ds4/-/issues) before submitting a new one.
 
-SPDX-License-Identifier: MIT
--->
+Thanks for taking the time to fill out this bug report! In order to make it effective, please provide the following information.
 
-# Description
+# Issue Description
 
-Please describe the issue.
+## Expected Behavior
 
-# Steps to Reproduce
+(What is the behavior that you expected?)
+
+## Current Behavior
+
+(What is the current behavior, i.e., what happens actually?)
+
+## Steps to Reproduce
+
+(What are the steps to reproduce the problem?)
 
 1. ...
 2. ...
 3. ...
 
-# Expected Behavior
+## Context
 
-Please describe the expected behavior.
+(Please provide any additional context that might be helpful, e.g. log messages,
+screenshots, videos, or exports of problematic scenes or worlds.)
 
-# Actual Behavior
+# Environment Details
 
-Please describe the actual behavior.
+## Version
 
-# Additional Details
+(Which version(s) of DS4 are you seeing the problem on?)
 
-These are optional, please add them if it makes sense.
+## Foundry VTT Version
 
-- ![Screenshot]()
-- [Logfile]()
-- ...
+(Which version(s) and build of Foundry VTT are you seeing the problem on?)
 
-# Possible Solutions
+## Operating System
 
-If you have any suggestions on how to solve the issue, please add them here.
+(Which operating system are you using? (Windows, OS X, Linux (which distro)))
+
+##  Browser / App
+
+(Are you using a Browser or the native Electron application?)
+
+## Relevant Modules
+
+(Please list any active modules (including their versions) that you think might be relevant.)
diff --git a/.gitlab/issue_templates/Bug Report.md.license b/.gitlab/issue_templates/Bug Report.md.license
new file mode 100644
index 0000000..caa655b
--- /dev/null
+++ b/.gitlab/issue_templates/Bug Report.md.license	
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2022 Johannes Loher
+
+SPDX-License-Identifier: MIT
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Feature Request.md b/.gitlab/issue_templates/Feature Request.md
index 913ef8f..94ea141 100644
--- a/.gitlab/issue_templates/Feature Request.md	
+++ b/.gitlab/issue_templates/Feature Request.md	
@@ -1,19 +1,11 @@
-<!--
-SPDX-FileCopyrightText: 2021 Johannes Loher
+Your issue may already have been reported! Please search on the [issue tracker](https://git.f3l.de/dungeonslayers/ds4/-/issues) before submitting a new one.
 
-SPDX-License-Identifier: MIT
--->
-
-# Story
-
-As a …, I want … so that …
+In order to submit an effective feature request, please provide the following information.
 
 # Description
 
-Please add a more detailed description of the feature here.
+(Please describe the proposal in as much detail as you feel is necessary.)
 
-# Acceptance criteria
+# Context
 
-1. Criterion 1
-2. Criterion 2
-3. …
+(Is there anything else you can add about the proposal? You might want to link to related issues here if you haven't already.)
diff --git a/.gitlab/issue_templates/Feature Request.md.license b/.gitlab/issue_templates/Feature Request.md.license
new file mode 100644
index 0000000..caa655b
--- /dev/null
+++ b/.gitlab/issue_templates/Feature Request.md.license	
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2022 Johannes Loher
+
+SPDX-License-Identifier: MIT
\ No newline at end of file