diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..2cd84ca
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,26 @@
+<!-- Thank you for taking the time to report a bug! -->
+<!--- Please write a short summary here -->
+
+## Expected Behavior
+
+<!--- Tell us what should happen -->
+
+## Current Behavior
+
+<!--- Tell us what happens instead of the expected behavior -->
+
+## Possible Solution
+
+<!--- Not required -->
+
+## Steps to Reproduce
+
+<!--- Add code to reproduce, if relevant -->
+
+- first ...
+- then ...
+- then ...
+
+## Context
+
+<!--- Which version of Kirby? Which version of the plugin? What OS? Did you install the plugin with composer or manually? How do you configure and use the plugin (manually, field, endpoint)? -->
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..ff3a532
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,19 @@
+<!-- Thank you for your contribution! -->
+<!--- Please write a short summary of your changes here -->
+
+## Description
+
+<!--- Describe your changes in detail -->
+
+## Motivation
+
+<!--- Why this change? What problem does it solve? -->
+
+## Testing
+
+<!--- What did you test? -->
+<!--- Did you test all three ways to use the plugin with your change? -->
+
+## Related issue
+
+<!-- Not required, only for bugfixes, link the issue here -->