diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..6b903f8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,31 @@
+<!--
+1. Please check if an issue already exists so there are no duplicates
+2. Fill out the whole template so we have a good overview on the issue
+3. Do not remove any section of the template. If something is not applicable leave it empty but leave it in the Issue
+4. Please follow the template, otherwise we'll have to ask you to update it
+-->
+
+# This is a (Bug Report / Feature Proposal)
+
+#### :tophat: Description
+
+For bug reports:
+* What went wrong?
+* What did you expect should have happened?
+* What was the config you used?
+* What stacktrace or error message from your provider did you see?
+
+For feature proposals:
+* What is the use case that should be solved. The more detail you describe this in the easier it is to understand for us.
+* If there is additional config how would it look
+
+#### :pushpin: Related issues
+* #12345
+
+#### :clipboard: Additional Data
+
+* ***Decidim deployment where you found the issue***:
+* ***Browser & version***:
+* ***Screenshot***:
+* ***Error messages***:
+* ***URL to reproduce the error***:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..0760aa8
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,16 @@
+#### :tophat: What? Why?
+
+
+#### :pushpin: Related Issues
+- Related to #?
+- Fixes #?
+
+#### :clipboard: Subtasks
+- [x] Subtask 1
+- [ ] Subtask 2
+
+### :camera: Screenshots (optional)
+![Description](URL)
+
+#### :ghost: GIF
+![]()