diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md
new file mode 100644
index 0000000000000000000000000000000000000000..49f71fd43d3a81f7d50e86af4da2d11b45a60304
--- /dev/null
+++ b/.gitlab/issue_templates/bug.md
@@ -0,0 +1,14 @@
+## Description
+
+### Observed
+
+*Description of bug*
+
+### Expected
+
+*What behaviour you would expect*
+
+## Tasks
+
+* [ ] First step
+* [ ] Second step
\ No newline at end of file
diff --git a/.gitlab/issue_templates/feature.md b/.gitlab/issue_templates/feature.md
new file mode 100644
index 0000000000000000000000000000000000000000..820e8e50bafad3d90ef75d762eb5105b8484bf6c
--- /dev/null
+++ b/.gitlab/issue_templates/feature.md
@@ -0,0 +1,8 @@
+## Description
+
+*Description of the new feature*
+
+## Tasks
+
+* [ ] First step
+* [ ] Second step
\ No newline at end of file
diff --git a/.gitlab/issue_templates/test_template.md b/.gitlab/issue_templates/test_template.md
deleted file mode 100644
index 45173810389914c174876ac0a8e649b31b613016..0000000000000000000000000000000000000000
--- a/.gitlab/issue_templates/test_template.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# First template
-
-This is an attempt to add a template to GitLab
diff --git a/.gitlab/merge_request_templates/bug.md b/.gitlab/merge_request_templates/bug.md
new file mode 100644
index 0000000000000000000000000000000000000000..52567fabd71d51a9abbfc65553c1cfea00c3df12
--- /dev/null
+++ b/.gitlab/merge_request_templates/bug.md
@@ -0,0 +1,8 @@
+## Definition of Done
+
+* [ ] Test has been added to reproduce and fix the bug (*only apply for Python at the moment*)
+* [ ] Merge request has been revised and validated
+
+## Related issue(s)
+
+Closes *Issue number (e.g. #35)*
diff --git a/.gitlab/merge_request_templates/feature.md b/.gitlab/merge_request_templates/feature.md
new file mode 100644
index 0000000000000000000000000000000000000000..f24c851513d40f2f4dc110b40078ec495a57609b
--- /dev/null
+++ b/.gitlab/merge_request_templates/feature.md
@@ -0,0 +1,12 @@
+## Description
+
+*Description of the new feature (if different from the one described in the corresponding issue)*
+
+## Definition of Done
+
+* [ ] New code added is tested (*only apply for Python at the moment*)
+* [ ] Merge request has been revised and validated
+
+## Related issue(s)
+
+Closes *Issue number (e.g. #35)*