diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b866d5c45..abce93b51 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,30 +1,18 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Something is not working right. Or error messages are unclear.
 title: ''
 labels: bug
 assignees: ''
 ---
 
-### README
-
-We use Github Discussions as a forum to discuss ideas and troubleshoot problems. If you are unsure if the problem you are experiencing is a bug, or would like to request a feature, please rather create a discussion. We can always convert it into an issue if needed.
-
-If you are reporting a bug, please add as much detail as possible. The sections below are to help you add relevant information. Please fill in all the applicable sections.
-
-### END OF README
-
 #### Describe the bug
 
 A clear and concise description of what the bug is.
 
 #### To Reproduce
 
-Example configuration reproducing the issue, or steps to reproduce the behavior:
-
-#### Expected behavior
-
-A clear and concise description of what you expected to happen.
+Example configuration reproducing the issue, or steps to reproduce the behavior.
 
 #### Screenshots
 
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
new file mode 100644
index 000000000..a70908dce
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Question, Discussion, Idea?
+    url: https://github.com/lowdefy/lowdefy/discussions/new
+    about: If you are unsure if the problem you are experiencing is a bug, or would like to request a feature, please rather create a discussion.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..b0119745c
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,16 @@
+<!--
+Thanks for opening a PR! Your contribution is much appreciated.
+To make sure your PR is handled as smoothly as possible please:
+ - Link issue via "Closes #[issue_number]
+ - Choose & follow the right checklist for the change that you're making:
+-->
+
+Closes: ?
+
+### What are the changes and their implications?
+
+## Checklist
+
+- [ ] Pull request is made to the "develop" branch
+- [ ] Tests added
+- [ ] Documentation added/updated