4 files changed, 49 insertions, 7 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 09e57d8a..5626fba3 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,18 +1,12 @@
 ---
 name: Bug report
 about: Let us know about a bug in lombok
-title: ''
+title: '[BUG] '
 labels: ''
 assignees: ''
 
 ---
 
-**Things you should NOT report here**
-
-* Please do not report any problems with the intellij plugin here; file these with the [intellij lombok plugin github repo](https://github.com/mplushnikov/lombok-intellij-plugin/issues)
-
-* Please do not report any security vulnerabilities you found in lombok itself here. Instead, let us know privately via [Tidelift security contact](https://tidelift.com/security) so we can coordinate a plan to release a fix responsibly.
-
 **Describe the bug**
 A clear and concise description of what the bug is.
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..13e71526
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Request a lombok feature or enhancement
+title: '[FEATURE] '
+labels: ''
+assignees: ''
+
+---
+
+**Before submitting**
+Please check our [wiki](https://github.com/rzwitserloot/lombok/wiki) because some feature requests are asked _a lot_ and there are good reasons (as explained on the wiki) why we can't (yet) implement them or why we won't implement them.
+
+**Describe the feature**
+A clear and concise description of what the feature request/enhancement is. What is the goal of adding this feature request? This should include 2 java snippets: One 'lomboked' version, which is java code with (for example) an annotation that is short and boilerplate free, and a second snippet that shows precisely what lombok will do under the hood. Lombok can only turn java code that is valid java syntax into different java code.
+
+**Describe the target audience**
+Describe which programmers and/or which kinds of programs would benefit from your feature proposal. If the feature proposal interacts with a library that isn't part of the core java libraries, link to this project.
+
+**Additional context**
+Add any other context about the feature / enhancement here.
diff --git a/.github/ISSUE_TEMPLATE/intellij_plugin.md b/.github/ISSUE_TEMPLATE/intellij_plugin.md
new file mode 100644
index 00000000..8cd33845
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/intellij_plugin.md
@@ -0,0 +1,14 @@
+---
+name: IntelliJ plugin bug report or feature request
+about: Let us know about a problem with lombok support in JetBrains IntelliJ IDEA 
+title: '[DO NOT POST HERE]'
+labels: ''
+assignees: ''
+
+---
+
+***You're in the wrong place!***
+
+Please do not report any problems or feature requests for the intellij plugin here; file these with the [intellij lombok plugin github repo](https://github.com/mplushnikov/lombok-intellij-plugin/issues).
+
+Thank you!
diff --git a/.github/ISSUE_TEMPLATE/security_issue.md b/.github/ISSUE_TEMPLATE/security_issue.md
new file mode 100644
index 00000000..44033bc0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/security_issue.md
@@ -0,0 +1,14 @@
+---
+name: Security issue with lombok
+about: Let us know about a security vulnerability in lombok 
+title: '[DO NOT POST HERE]'
+labels: ''
+assignees: ''
+
+---
+
+***Please do not report this here!***
+
+github issues are public. Please contact us privately so that we can work together to coordinate a fix for the vulnerability together with making the vulnerability public.
+
+You can inform the [Tidelift security contact](https://tidelift.com/security) or if you prefer, contact the core contributors of Project Lombok directly by emailing `info@projectlombok.org`