diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..fbd645f93
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,46 @@
+**Is it a ?**
+
+- [ ] Bug Report
+
+- [ ] Feature Request
+
+## Bug Report
+
+### Step 1: Are you ready to report ?
+   - Your issue may already be reported! Please search on the [issue track](../) before creating one.
+   - [ ] I have test with the last (dev) version of the software?  ( If not, and if possible, run your test again with the most recent version available.)
+
+### Step 2 : What is your environment ?
+  * browser / app : _____
+  * version of the software you use : _____
+  * device / operating system : _____
+  
+### Step 3: Describe the problem:
+
+  * What do you obtain? A copy of the error message or a screenshot is always useful
+
+  * When does this occur? 
+
+#### Steps to reproduce:
+
+  1. _____
+  2. _____
+  3. _____
+  ...
+  
+  * What should be the behaviour from your point of view? How do you expect the service to work?
+
+
+### Step 4 (optional) : Other Comments:
+  * What is the context of this ticket? If not obvious, explain why you need to do this.
+ 
+  * If you have an idea about the technical background of the ticket, please share it.
+  
+  
+## Feature Request
+
+#### Feature Description
+
+Please describe the feature you want to add to the project.
+
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..79f2ad590
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,5 @@
+Fixes #[Add issue number here. If you do not solve the issue entirely, please change the message e.g. "First steps for issues #IssueNumber]
+
+Changes: [Add here what changes were made in this issue and if possible provide links.]
+
+Screenshots/GIF for the change: [If possible, please add relevant screenshots/GIF]