diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 61afa8d..492b0db 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,55 +1,25 @@
-name: Bug Report
+name: Bug report
 description: File a bug report
 body:
   - type: markdown
     attributes:
       value: |
-        Thanks for reporting an issue, please review the task list below before submitting the issue. Your issue report will be closed if the issue is incomplete and the below tasks not completed.
-
-        NOTE: If you are unsure about something and the issue is more of a question a better place to ask questions is on [Github Discussions](https://github.com/kestra-io/kestra/discussions) or [Slack](https://api.kestra.io/v1/communities/slack/redirect).
+        Thanks for reporting an issue! Please provide a [Minimal Reproducible Example](https://stackoverflow.com/help/minimal-reproducible-example) and share any additional information that may help reproduce, troubleshoot, and hopefully fix the issue, including screenshots, error traceback, and your Kestra server logs. For quick questions, you can contact us directly on [Slack](https://kestra.io/slack).
   - type: textarea
     attributes:
-      label: Expected Behavior
-      description: A concise description of what you expected to happen.
-      placeholder: Tell us what should happen
+      label: Describe the issue
+      description: A concise description of the issue and how we can reproduce it.
+      placeholder: Describe the issue step by step
     validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Actual Behaviour
-      description: A concise description of what you're experiencing.
-      placeholder: Tell us what happens instead
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Steps To Reproduce
-      description: Steps to reproduce the behavior.
-      placeholder: |
-        1. In this environment...
-        2. With this config...
-        3. Run '...'
-        4. See error...
-    validations:
-      required: false
+      required: true
   - type: textarea
     attributes:
-      label: Environment Information
+      label: Environment
       description: Environment information where the problem occurs.
       value: |
-        - Kestra Version:
-        - Plugin version: 
-        - Operating System (OS / Docker / Kubernetes):
-        - Java Version (If not docker):
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Example flow
-      description: Example flow source.
-      placeholder: |
-        If relevant, an example flow
+        - Kestra Version: develop
     validations:
       required: false
 labels:
   - bug
+  - area/plugin
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index 11f8a1a..de9ab6a 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -1,15 +1,12 @@
 name: Feature request
 description: Create a new feature request
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Please describe the feature you want for Kestra to implement, before that check if there is already an existing issue to add it.
   - type: textarea
     attributes:
       label: Feature description
-      placeholder: Tell us what feature you would like for Kestra to have and what problem is it going to solve
+      placeholder: Tell us more about your feature request
     validations:
       required: true
 labels:
   - enhancement
+  - area/plugin
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/other.yml b/.github/ISSUE_TEMPLATE/other.yml
deleted file mode 100644
index 20f261f..0000000
--- a/.github/ISSUE_TEMPLATE/other.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: Other
-description: Something different
-body:
-  - type: textarea
-    attributes:
-      label: Issue description
-    validations:
-      required: true