diff --git a/.github/ISSUE_TEMPLATE/rfc.md b/.github/DISCUSSION_TEMPLATE/rfcs.yml
similarity index 78%
rename from .github/ISSUE_TEMPLATE/rfc.md
rename to .github/DISCUSSION_TEMPLATE/rfcs.yml
index ae2337402..55909514f 100644
--- a/.github/ISSUE_TEMPLATE/rfc.md
+++ b/.github/DISCUSSION_TEMPLATE/rfcs.yml
@@ -1,7 +1,4 @@
-name: Request for Comments (RFC)
-description: Feature design and detailed proposals
-title: "RFC: TITLE"
-labels: ["RFC", "triage"]
+title: "RFC: 
"
 body:
   - type: markdown
     attributes:
@@ -15,21 +12,18 @@ body:
   - type: dropdown
     id: area
     attributes:
-      label: Which Powertools for AWS Lambda (Java) utility does this relate to?
+      label: Which area does this RFC relate to?
       options:
         - Tracer
         - Logger
         - Metrics
-        - Middleware factory
         - Parameters
-        - Batch processing
-        - Typing
+        - Large Messages
+        - Batch Processing
         - Validation
-        - Event Source Data Classes
-        - Parser
         - Idempotency
-        - Feature flags
-        - JMESPath functions
+        - Custom Resources
+        - Serialization
         - Other
     validations:
       required: true
@@ -81,7 +75,7 @@ body:
     attributes:
       label: Alternative solutions
       description: Please describe what alternative solutions to this use case, if any
-      render: markdown
+      render: Markdown
     validations:
       required: false
   - type: checkboxes
@@ -89,7 +83,7 @@ body:
     attributes:
       label: Acknowledgment
       options:
-        - label: This feature request meets [Powertools for AWS Lambda (Java) Tenets](https://docs.powertools.aws.dev/lambda/Java/#tenets)
+        - label: This RFC meets [Powertools for AWS Lambda (Java) Tenets](https://docs.powertools.aws.dev/lambda/java/latest/#tenets)
           required: true
         - label: Should this be considered in other Powertools for AWS Lambda languages? i.e. [Python](https://github.com/aws-powertools/powertools-lambda-python/), [TypeScript](https://github.com/aws-powertools/powertools-lambda-typescript/), and [.NET](https://github.com/aws-powertools/powertools-lambda-dotnet/)
           required: false
@@ -98,10 +92,16 @@ body:
       value: |
         ---
 
-        **Disclaimer**: We value your time and bandwidth. As such, any pull requests created on non-triaged issues might not be successful.
+        **Disclaimer**: After creating an RFC, please wait until it is reviewed and signed-off by a maintainer before implementing it. This will reduce amount of rework and the chance that a pull request gets rejected.
 
         Metadata information for admin purposes, please leave them empty.
 
         * RFC PR:
         * Approved by: ''
-        * Reviewed by: ''
\ No newline at end of file
+        * Reviewed by: ''
+  - type: input
+    id: notes
+    attributes:
+      label: Future readers
+      description: Please not edit this field
+      value: "Please react with 👍 and your use case to help us understand customer demand."
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.yml
similarity index 98%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/bug_report.yml
index 8810605b9..2b0ae71e8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,7 @@
 name: Bug report
 description: Report a reproducible bug to help us improve
 title: "Bug: TITLE"
+type: "Bug"
 labels: ["bug", "triage"]
 body:
   - type: markdown
@@ -49,7 +50,7 @@ body:
     id: version
     attributes:
       label: Powertools for AWS Lambda (Java) version
-      placeholder: "latest, 1.19.0"
+      placeholder: "latest, 2.0.1"
       value: latest
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 9eae2e167..01a8d495b 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,4 +2,7 @@ blank_issues_enabled: false
 contact_links:
   - name: Ask a question
     url: https://github.com/aws-powertools/powertools-lambda-java/discussions/new
-    about: Ask a general question about Lambda Powertools
+    about: Ask a general question about Powertools for AWS Lambda
+  - name: Join Community Discord Server
+    url: https://discord.gg/B8zZKbbyET
+    about: "Check out the #java channel"
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index b837b7ad5..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: feature-request, triage
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-
-
-**Describe the solution you'd like**
-
-
-**Describe alternatives you've considered**
-
-
-**Additional context**
-
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..6aaef0718
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,52 @@
+name: Feature request
+description: Suggest an idea for Powertools for AWS Lambda
+title: "Feature request: TITLE"
+labels: ["feature-request", "triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to suggest an idea to the Powertools for AWS Lambda (Java) project.
+  - type: textarea
+    id: problem
+    attributes:
+      label: Use case
+      description: Please help us understand your use case or problem you're facing
+    validations:
+      required: true
+  - type: textarea
+    id: suggestion
+    attributes:
+      label: Solution/User Experience
+      description: Please share what a good solution would look like to this use case
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternative solutions
+      description: Please describe what alternative solutions to this use case, if any
+      render: Markdown
+    validations:
+      required: false
+  - type: checkboxes
+    id: acknowledgment
+    attributes:
+      label: Acknowledgment
+      options:
+        - label: This feature request meets [Powertools for AWS Lambda (Java) Tenets](https://docs.powertools.aws.dev/lambda/java/latest/#tenets)
+          required: true
+        - label: Should this be considered in other Powertools for AWS Lambda languages? i.e. [Python](https://github.com/aws-powertools/powertools-lambda-python/), [TypeScript](https://github.com/aws-powertools/powertools-lambda-typescript/), and [.NET](https://github.com/aws-powertools/powertools-lambda-dotnet/)
+          required: false
+  - type: markdown
+    attributes:
+      value: |
+        ---
+
+        **Disclaimer**: After creating an issue, please wait until it is triaged and confirmed by a maintainer before implementing it. This will reduce amount of rework and the chance that a pull request gets rejected.
+  - type: input
+    id: notes
+    attributes:
+      label: Future readers
+      description: Please not edit this field
+      value: "Please react with 👍 and your use case to help us understand customer demand."
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/share_your_work.yml b/.github/ISSUE_TEMPLATE/share_your_work.yml
index 01dae4fdf..f0f879225 100644
--- a/.github/ISSUE_TEMPLATE/share_your_work.yml
+++ b/.github/ISSUE_TEMPLATE/share_your_work.yml
@@ -1,7 +1,7 @@
 name: I Made This (showcase your work)
 description: Share what you did with Powertools for AWS Lambda (Java) 💞💞. Blog post, workshops, presentation, sample apps, etc.
 title: "[I Made This]: "
-labels: ["community-content"]
+labels: ["community-content", "triage"]
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/support_powertools.yml b/.github/ISSUE_TEMPLATE/support_powertools.yml
index 8623c2b73..9067d47ec 100644
--- a/.github/ISSUE_TEMPLATE/support_powertools.yml
+++ b/.github/ISSUE_TEMPLATE/support_powertools.yml
@@ -1,7 +1,7 @@
 name: Support Powertools for AWS Lambda (Java) (become a reference)
 description: Add your organization's name or logo to the Powertools for AWS Lambda (Java) documentation
 title: "[Support Powertools for AWS Lambda (Java)]: "
-labels: ["customer-reference"]
+labels: ["customer-reference", "triage"]
 body:
   - type: markdown
     attributes:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d4b6d17ff..f30703bb4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,25 +1,28 @@
-**Issue #, if available:**
+## Summary
 
-## Description of changes:
+### Changes
 
-
+> Please provide a summary of what's being changed
 
-**Checklist**
+
 
- 
+> Please add the issue number below, if no issue is present the PR might get blocked and not be reviewed
 
-* [ ] [Meet tenets criteria](https://docs.powertools.aws.dev/lambda-java/#tenets)
-* [ ] Update tests
-* [ ] Update docs
-* [ ] PR title follows [conventional commit semantics](https://www.conventionalcommits.org/en/v1.0.0/)
+**Issue number:** 
 
-## Breaking change checklist
+
+- Read the Contributing Guidelines at https://github.com/aws-powertools/powertools-lambda-java/blob/main/CONTRIBUTING.md#sending-a-pull-request
+- Check that there isn't already a PR that addresses the same issue. If you find a duplicate, please leave a comment under the existing PR so we can discuss how to move forward
+- Check that the change meets the project's tenets https://docs.powertools.aws.dev/lambda/java/latest/#tenets
+- Add a PR title that follows the conventional commit semantics - https://www.conventionalcommits.org/en/v1.0.0/
+- If relevant, add tests that prove that the change is effective and works
+- Whenever relevant, make sure to comment functions/methods/types and make appropriate changes to the documentation
+------->
 
-**RFC issue #**:
-
-* [ ] Migration process documented
-* [ ] Implement warnings (if it can live side by side)
+---
 
 By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
+
+**Disclaimer**: We value your time and bandwidth. As such, any pull requests created on non-triaged issues might not be successful.
\ No newline at end of file