diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.md b/.github/ISSUE_TEMPLATE/01_bug_report.md
new file mode 100644
index 000000000..e4d5c0166
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.md
@@ -0,0 +1,27 @@
+---
+name: 🐜 Bug report
+about: If something isn't working 🔧
+---
+
+### Please describe your environment
+
+At least:
+
+-   Operating System + version (and distro if linux):
+-   Software versions (Java, Terraform, etc)
+
+### What is the expected behavior?
+
+### What is the actual behavior?
+
+### Please provide a reproducible path or test that demonstrates the bug.
+
+### Other notes on how to reproduce the issue
+
+### Please provide relevant logs
+
+### Any possible solutions?
+
+### If the bug is confirmed, would you be willing to submit a PR?
+
+Yes / No _(Help can be provided if you need assistance submitting a PR)_
diff --git a/.github/ISSUE_TEMPLATE/02_feature_request.md b/.github/ISSUE_TEMPLATE/02_feature_request.md
new file mode 100644
index 000000000..e15f595ae
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/02_feature_request.md
@@ -0,0 +1,20 @@
+---
+name: 🚀 Feature request
+about: If you have a feature request 💡
+---
+
+### Context
+
+What are you trying to do and how would you want to do it differently? Is it something you currently you cannot do? Is this related to an issue/problem? Do you want support for a new platform?
+
+### Alternatives
+
+Can you achieve the same result doing it in an alternative way? Is the alternative considerable?
+
+### Has the feature been requested before?
+
+Please provide a link to the issue.
+
+### If the feature request is approved, would you be willing to submit a PR?
+
+Yes / No _(Help can be provided if you need assistance submitting a PR)_
diff --git a/.github/ISSUE_TEMPLATE/03_challenge_idea.md b/.github/ISSUE_TEMPLATE/03_challenge_idea.md
new file mode 100644
index 000000000..c0339c8fd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/03_challenge_idea.md
@@ -0,0 +1,18 @@
+---
+name: 🧩 Challenge idea
+about: If you have a challenge idea 💡
+---
+
+### Context
+
+-   What should the challenge scenario be like?
+-   What should the participant learn from completing the challenge?
+-   For what category would the challenge be? (e.g. Docker, K8s, binary)
+
+### Did you encounter this in real life? Could you tell us more about the scenario?
+
+**Don't break any NDAs 🙃**
+
+### If the challenge request is approved, would you be willing to submit a PR?
+
+Yes / No _(Help can be provided if you need assistance submitting a PR)_
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..11464190e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: WrongSecrets Slack Channel
+    url: https://owasp.slack.com/archives/C02KQ7D9XHR
+    about: Please ask and answer questions here. 🏥
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 096abbb15..a1da641e4 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,13 +1,37 @@
-Thank you for submitting a pull request to the WrongSecrets app!
+ <!-- Thank you for submitting a pull request to the WrongSecrets app! See what makes a good PR at https://github.com/OWASP/wrongsecrets/blob/master/CONTRIBUTING.md-->
 
-What kind of changes does this PR include?
+### What kind of changes does this PR include?
 
 -   [ ] Fixes or refactors
 -   [ ] A new challenge
 -   [ ] Additional documentation
 -   [ ] Something else
 
-Checklist:
+#### Description
+
+<!---
+Please provide a helpful summary of what change this pull request will introduce.
+--->
+
+### Relations
+
+<!---
+If your pull request fully resolves and should automatically close the linked issue, use Closes. Otherwise, use Relates.
+
+For Example:
+
+Relates #0000
+or
+Closes #0000
+--->
+
+### References
+
+<!---
+Optionally, provide any helpful references that may help the reviewer(s).
+--->
+
+### Checklist:
 
 -   [ ] All the contributions made are solely the work of me and my co-authors
 -   [ ] I tested the changes in this PR (if applicable)