diff --git a/.gitlab/merge_request_templates/Bugfix.md b/.gitlab/merge_request_templates/Bugfix.md
new file mode 100644
index 000000000..a3c7df32a
--- /dev/null
+++ b/.gitlab/merge_request_templates/Bugfix.md
@@ -0,0 +1,32 @@
+## Summary
+
+Add a description of your merge request here. What does your new feature do?
+
+Describe in detail what your patch does, why it does that, etc. Merge requests
+without an adequate description are difficult to review, and probably we will
+ask for more information!
+
+Please also keep this description up-to-date with any discussion that takes
+place so that reviewers can understand your intent. This is especially
+important if they didn't participate in the discussion.
+
+Make sure to remove this comment when you are done.
+
+Fill in the following lines as appropriate to automatically close GitLab issue or Bugzilla bugs
+Fixes <!-- Gitlab Issue Number -->
+BUG: <!-- bugzilla bug -->
+
+## Test Plan
+
+### Before:
+Add a quick discription of the (buggy) behavior of the app before this fix
+This section does not need to be too detailed because it should mostly be
+covered by the bug report and the summary. Just share the steps for how to
+reproduce the bug.
+
+### After:
+Add a more detailed description of how to exercise the new behavior, showing
+that the bug has been fixed. If any other behavior has been changed, share
+the steps to verify that the new behavior doesn't have any regressions.
+
+/label ~bugfix
diff --git a/.gitlab/merge_request_templates/Feature.md b/.gitlab/merge_request_templates/Feature.md
new file mode 100644
index 000000000..d9686cf2c
--- /dev/null
+++ b/.gitlab/merge_request_templates/Feature.md
@@ -0,0 +1,27 @@
+## Summary
+
+Add a description of your merge request here. What does your new feature do?
+
+Describe in detail what your patch does, why it does that, etc. Merge requests
+without an adequate description are difficult to review, and probably we will
+ask for more information!
+
+Please also keep this description up-to-date with any discussion that takes
+place so that reviewers can understand your intent. This is especially
+important if they didn't participate in the discussion.
+
+Make sure to remove this comment when you are done.
+
+Implements <!-- GitLab Issue Number -->
+
+## Test Plan
+
+Add a description of how to test your patch here. Tell us how to use the new
+feature and what we should be seeing. If applicable, it is great to include
+screenshots, either here or in the Summary section.
+
+It can be difficult to understand a new feature from the text description in
+the summary, so put enough detail here that so that we can understand how to run
+the new feature and we can play with it ourselves to understand it.
+
+/label ~feature