diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
new file mode 100644
index 0000000000000000000000000000000000000000..c180ca4ee189a2bf2f8f47e8170817fc90603a28
--- /dev/null
+++ b/.gitlab/issue_templates/Bug.md
@@ -0,0 +1,31 @@
+### Summary
+
+(Summarize the bug encountered concisely)
+
+
+### Steps to reproduce
+
+(How one can reproduce the issue - this is very important)
+
+
+### What is the current *bug* behavior?
+
+(What actually happens)
+
+
+### What is the expected *correct* behavior?
+
+(What you should see instead)
+
+
+### Relevant logs and/or screenshots
+
+(Paste any relevant logs - please use code blocks (```) to format console output,
+logs, and code as it's very hard to read otherwise.)
+
+
+### Possible fixes
+
+(If you can, link to the line of code that might be responsible for the problem)
+
+/label ~Bug
diff --git a/.gitlab/issue_templates/Feature.md b/.gitlab/issue_templates/Feature.md
new file mode 100644
index 0000000000000000000000000000000000000000..42d6d3491337a252e3639dcb67eb0e83582f3dc9
--- /dev/null
+++ b/.gitlab/issue_templates/Feature.md
@@ -0,0 +1,7 @@
+### Summary
+
+(Summarize the feature request concisely)
+
+
+
+/label ~"Feature request"
\ No newline at end of file
diff --git a/.gitlab/merge_request_templates/Bug.md b/.gitlab/merge_request_templates/Bug.md
new file mode 100644
index 0000000000000000000000000000000000000000..a2fa1589ebc1b6862378a8d49534578ab065226d
--- /dev/null
+++ b/.gitlab/merge_request_templates/Bug.md
@@ -0,0 +1,9 @@
+### What does this MR do?
+
+### Does this MR meet the acceptance criteria?
+
+* [ ] [Coding style guidelines](https://gitlab.psi.ch/OPAL/src/wikis/For-Developers/CodingStyle)
+* [ ] [Change to Release Notes](https://gitlab.psi.ch/OPAL/src/wikis/ReleaseNotes/ReleaseNotes)
+
+
+/label ~Bug
diff --git a/.gitlab/merge_request_templates/Feature.md b/.gitlab/merge_request_templates/Feature.md
new file mode 100644
index 0000000000000000000000000000000000000000..041e9ef4c394170c12ce2c6fb4ee04cc457df161
--- /dev/null
+++ b/.gitlab/merge_request_templates/Feature.md
@@ -0,0 +1,10 @@
+### What does this MR do?
+
+### Does this MR meet the acceptance criteria?
+
+* [ ] [Coding style guidelines](https://gitlab.psi.ch/OPAL/src/wikis/For-Developers/CodingStyle)
+* [ ] [Change to Release Notes](https://gitlab.psi.ch/OPAL/src/wikis/ReleaseNotes/ReleaseNotes)
+* [ ] Documentation added
+
+
+/label ~"Feature request"