diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..4b5be6fc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,17 @@
+---
+name: Bug report
+about: Something is broken, and you like us to fix it.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+_A clear and concise description of what the bug is._
+
+**Affected Versions**
+_Only provide a version when this bug appears in another version than the latest GA release_
+
+**Reproducer**
+Please provide a [Minimimal Reproducable Example](https://stackoverflow.com/help/minimal-reproducible-example), preferable as a Github repository. Make sure to include the database, either as an in memory database or if that is not possible using [Testcontainers](https://www.testcontainers.org/).
diff --git a/.github/ISSUE_TEMPLATE/do-not-submit-security-issues-on-github--see-https---spring-io-security-policy.md b/.github/ISSUE_TEMPLATE/do-not-submit-security-issues-on-github--see-https---spring-io-security-policy.md
new file mode 100644
index 00000000..d013f872
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/do-not-submit-security-issues-on-github--see-https---spring-io-security-policy.md
@@ -0,0 +1,12 @@
+---
+name: Do not submit security issues on GitHub! See https://spring.io/security-policy
+about: Do not submit security issues on GitHub! See https://spring.io/security-policy
+title: Do not submit security issues on GitHub! See https://spring.io/security-policy
+labels: ''
+assignees: ''
+
+---
+
+**Do not submit security issues on GitHub!**
+
+See https://spring.io/security-policy
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..4d26927a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,15 @@
+---
+name: Feature request
+about: Wouldn't it be great if this would work too?
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**What feature do you want?**
+_A clear and concise description of what you want to happen._
+
+**What problem does this solve?**
+_A clear and concise description of the problem that you have when this feature does not exist.
+Feel free to omit this if it just repeats the previous section_