diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
new file mode 100644
index 0000000..8c2add3
--- /dev/null
+++ b/.gitlab/issue_templates/Bug.md
@@ -0,0 +1,54 @@
+## Summary
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Expected behavior
+<!--- Tell us what you expected to happen -->
+
+## Current behavior
+<!--- Tell us what happened instead of the expected behavior -->
+
+## Detailed Description
+<!--- Provide a detailed description of the issue. Include links to screenshots or videos if necessary -->
+
+## Steps to reproduce
+<!--- Provide a detailed step by step description how to reproduce this issue -->
+1.
+2.
+3.
+4.
+
+## Possible solution
+<!--- Not obligatory, but suggest a fix/reason for the bug -->
+
+## Context (Environment)
+### Pumptools version(s) affected
+* <!--- Add one or multiple versions as a bullet list. Get the git hash from the version file as well -->
+
+### Game(s) and version(s) affected
+* <!--- Add one or multiple game versions as a bullet list -->
+
+### Log output
+See attachment.
+<!--- Provide log output as attachment. Make sure to censor sensitive data like usernames, home folder paths
+or device names if necessary -->
+
+### Configuration files
+See attachment.
+<!--- Provide any configuration files that you used, e.g. hook.conf. Make sure to censor sensitive data like
+paths with user names -->
+
+### Command line arguments
+<!--- Provide how you run the game from the command line with any additional arguments that you provided. 
+Also, provide any personal or altered scripts that you used. -->
+
+### APIs used
+* <!--- List all APIs you used as a bullet list, e.g. piuio-keyboard -->
+
+### OS version
+<!--- Provide the version of your distribution and kernel. Use the command uname -a for the latter -->
+
+### Hardware specs
+* CPU: <!--- Insert, e.g. Core i7 2600k 3.20ghz -->
+* RAM: <!--- Insert, e.g. 16 GB -->
+* GPU: <!--- Insert, e.g. Nvidia GeForce GTX 970, 4GB -->
+* Controllers/IO: <!--- Insert, e.g. Cobalt Flux over USB -->
diff --git a/.gitlab/issue_templates/Feature.md b/.gitlab/issue_templates/Feature.md
new file mode 100644
index 0000000..de02dba
--- /dev/null
+++ b/.gitlab/issue_templates/Feature.md
@@ -0,0 +1,14 @@
+## Summary
+<!--- Provide a general summary of your changes in the Title above -->
+
+## Detailed description
+<!--- Describe your feature in detail -->
+
+## Benefits
+<!--- Describe the value/benefits of the feature in detail -->
+
+## Drawbacks
+<!--- Describe any drawbacks that might be introduced with this feature -->
+
+## Current blockers
+<!--- Describe any blockers that need to be resolved before implementing this feature -->
\ No newline at end of file
diff --git a/.gitlab/merge_request_templates/Bugfix.md b/.gitlab/merge_request_templates/Bugfix.md
new file mode 100644
index 0000000..1059349
--- /dev/null
+++ b/.gitlab/merge_request_templates/Bugfix.md
@@ -0,0 +1,27 @@
+## Summary
+<!--- Provide a general summary of your changes in the Title above -->
+
+## Description
+<!--- Describe your changes in detail -->
+
+## Related Issue
+<!--- This project only accepts pull requests related to open issues -->
+<!--- If suggesting a new feature or change, please discuss it in an issue first -->
+<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
+<!--- Please link to the issue here: -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Checklist
+<!-- Make sure you covered all items, which apply, of the checklist below. -->
+<!-- Strikethrough items that do not apply and provide a brief description why. -->
+* [ ] Implemented (unit) test(s) which prove that the introduced changes are working as expected.
+* Tested with the following games:
+    * [ ] ... <!-- insert game name 1-->
+    * [ ] ... <!-- insert game name 2--->
+* [ ] Followed the developer (style) guidelines.
+* [ ] Updated existing doc of or add new doc to README file(s).
+* [ ] Updated development documentation.
\ No newline at end of file
diff --git a/.gitlab/merge_request_templates/Feature.md b/.gitlab/merge_request_templates/Feature.md
new file mode 100644
index 0000000..1059349
--- /dev/null
+++ b/.gitlab/merge_request_templates/Feature.md
@@ -0,0 +1,27 @@
+## Summary
+<!--- Provide a general summary of your changes in the Title above -->
+
+## Description
+<!--- Describe your changes in detail -->
+
+## Related Issue
+<!--- This project only accepts pull requests related to open issues -->
+<!--- If suggesting a new feature or change, please discuss it in an issue first -->
+<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
+<!--- Please link to the issue here: -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Checklist
+<!-- Make sure you covered all items, which apply, of the checklist below. -->
+<!-- Strikethrough items that do not apply and provide a brief description why. -->
+* [ ] Implemented (unit) test(s) which prove that the introduced changes are working as expected.
+* Tested with the following games:
+    * [ ] ... <!-- insert game name 1-->
+    * [ ] ... <!-- insert game name 2--->
+* [ ] Followed the developer (style) guidelines.
+* [ ] Updated existing doc of or add new doc to README file(s).
+* [ ] Updated development documentation.
\ No newline at end of file