diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..da9a2924e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,25 @@
+---
+name: 🐛 Bug report
+about: Create a report to help us improve
+---
+
+## Bug Report
+
+### Describe the bug
+<!-- A clear and concise description of what the bug is.-->
+
+### To Reproduce
+<!--Steps to reproduce the behavior:-->
+
+### Expected behavior
+<!--A clear and concise description of what you expected to happen.-->
+
+## Environment (please complete the following information):
+ - OS [e.g. Windows]:
+ - OS version
+ - Browser [e.g. chrome, safari]:
+ - Browser Version:
+ - Agent Version [e.g. 1.0.0]:
+
+## Additional context
+<!--Add any other context about the problem here.-->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..9075f7dfb
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,20 @@
+**Please check if the PR fulfills these requirements**
+
+- [ ] The PR has no duplicates (please search among the [Pull Requests](https://github.com/arduino/arduino-create-agent/pulls)
+      before creating one)
+- [ ] Tests for the changes have been added (for bug fixes / features)
+
+* **What kind of change does this PR introduce?**
+<!-- Bug fix, feature, ... -->
+
+- **What is the current behavior?**
+<!-- You can also link to an open issue here -->
+
+* **What is the new behavior?**
+<!-- if this is a feature change -->
+
+- **Does this PR introduce a breaking change?**
+<!-- What changes might users need to make in their workflow or application due to this PR? -->
+
+* **Other information**:
+<!-- Any additional information that could help the review process -->