diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
new file mode 100644
index 0000000..e42b565
--- /dev/null
+++ b/.gitlab/issue_templates/Bug.md
@@ -0,0 +1,20 @@
+Detailed description of the issue. Put as much information as you can, potentially
+with images showing the issue.
+
+Steps to reproduce:
+
+1. Open Hammond
+2. Do an action
+3. ...
+
+## Design Tasks
+
+* [ ]  design tasks
+
+## Development Tasks
+
+* [ ]  development tasks
+
+## QA Tasks
+
+* [ ]  qa (quality assurance) tasks
diff --git a/.gitlab/issue_templates/Feature.md b/.gitlab/issue_templates/Feature.md
new file mode 100644
index 0000000..d764866
--- /dev/null
+++ b/.gitlab/issue_templates/Feature.md
@@ -0,0 +1,17 @@
+Detailed description of the feature. Put as much information as you can.
+
+Proposed Mockups:
+
+(Add mockups of the proposed feature)
+
+## Design Tasks
+
+* [ ]  design tasks
+
+## Development Tasks
+
+* [ ]  development tasks
+
+## QA Tasks
+
+* [ ]  qa (quality assurance) tasks
diff --git a/TODO.md b/TODO.md
index 4f26a1b..67e0dc1 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,7 +3,7 @@
 **General:**
 
 - [x] Add CONTRIBUTING.md
-- [ ] Add Issues and Pull Request templates
+- [x] Add Issues and Pull Request templates
 - [ ] Write docs