diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index a5db12e5e..bb70db87f 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -2,15 +2,6 @@ name: "\U0001FAB2 Bug Report"
 description: Submit a bug report to help us improve PR-Agent
 labels: [ "bug" ]
 body:
-  - type: textarea
-    id: system-info
-    attributes:
-      label: System Info
-      description: Please share your system info with us.
-      render: shell
-      placeholder: platform, model used, etc...
-    validations:
-      required: true
 
   - type: dropdown
     id: information-git-provider
@@ -19,42 +10,31 @@ body:
       description: 'The problem arises when using:'
       options:
         - "Github"
+        - "Github Enterprise"
         - "Gitlab"
-        - "Bitbucket"
+        - "Bitbucket Cloud"
+        - "Bitbucket Server"
         - "Azure"
         - "Other"
-
-  - type: dropdown
-    id: information-bug-type
-    attributes:
-      label: Bug type
-      description: "The bugs I am experiencing are originated from:"
-      options:
-        - "PR-Agent commands"
-        - "Installation issues"
-        - "Other"
+      validations:
+        required: true
 
   - type: textarea
-    id: reproduction
+    id: system-info
+    attributes:
+      label: System Info
+      description: Please share your system info with us.
+      render: shell
+      placeholder: model used, deployment type (action/app/cli/...), etc...
     validations:
       required: true
-    attributes:
-      label: Reproduction (minimal, reproducible, runnable)
-      description: |
-        Please provide a code sample that reproduces the problem you ran into. It can be a GitHub link or just a code snippet.
-        If you have code snippets, error messages, stack traces please provide them here as well.
-        Important! Use code tags to correctly format your code. See https://help.github.com/en/github/writing-on-github/creating-and-highlighting-code-blocks#syntax-highlighting
-        Do not use screenshots, as they are hard to read and (more importantly) don't allow others to copy-and-paste your code.
-        Providing a **minimal**, **reproducible** reproduction using a **publicly available model** significantly increase the chances of a fix in a timely manner.
-
-      placeholder: |
-        Providing a minimal, reproducible reproduction using a publicly available model significantly increase the chances of a fix in a timely manner.
-
 
   - type: textarea
-    id: expected-behavior
+    id: bug-details
+    attributes:
+      label: Bug details
+      description: Please share your system info with us.
+      render: shell
+      placeholder: Describe the problem
     validations:
       required: true
-    attributes:
-      label: Expected behavior
-      description: "A clear and concise description of what you would expect to happen."