diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
new file mode 100644
index 0000000000..86e87ce7aa
--- /dev/null
+++ b/.gitlab/issue_templates/Bug.md
@@ -0,0 +1,31 @@
+## Summary
+<!-- Summarize the bug encountered concisely -->
+
+## System Information
+<!-- The more information are provided the easier it is to replicate the bug -->
+- **Operating system:** <!-- Windows, Linux (if possible, also name the distro), FreeBSD, Android, ... -->
+- **Processor architecture:** <!-- x86, x86-64, ARM, AARCH64, AVR, RISC-V, PowerPC, ... -->
+- **Compiler version:** <!-- 3.2, 3.2.2, 3.3, trunk, beta, ... (if possible, give also the git hash) -->
+- **Device:** <!-- Computer, Tablet, Mobile, Amiga, Microcontroller, ... -->
+
+## Steps to reproduce
+<!-- How one can reproduce the issue - this is very important! -->
+
+## Example Project
+<!-- If possible, please create an example project that exhibits the problematic
+behavior, and link to it here in the bug report. -->
+
+## 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.
+You can also use syntax highlighting for Pascal with: ```pascal  the code```
+For more information see https://docs.gitlab.com/ee/user/markdown.html -->
+
+## Possible fixes
+<!-- If you can, link to the line of code that might be responsible for the problem -->
diff --git a/.gitlab/merge_request_templates/Compiler.md b/.gitlab/merge_request_templates/Compiler.md
new file mode 100644
index 0000000000..cd40c0c24b
--- /dev/null
+++ b/.gitlab/merge_request_templates/Compiler.md
@@ -0,0 +1,18 @@
+## Summary
+<!-- Summarize the changes from this merge request -->
+
+## System
+<!-- All systems this patch will have an effect om -->
+- **Operating system:** <!-- Windows, Linux (if possible, also name the distro), FreeBSD, Android, ... -->
+- **Processor architecture:** <!-- x86, x86-64, ARM, AARCH64, AVR, RISC-V, PowerPC, ... -->
+- **Device:** <!-- Computer, Tablet, Mobile, Amiga, Microcontroller, ... -->
+
+## What is the current bug behavior?
+<!-- What actually happens -->
+
+## What is the behavior after applying this patch?
+<!-- 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.  -->