diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 33bd3288..57dbcab1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,6 @@
 name: Bug Report
 description: Create a bug report
-labels: ['bug']
+labels: ["bug"]
 body:
   - type: markdown
     attributes:
@@ -11,18 +11,27 @@ body:
   - type: textarea
     attributes:
       label: To Reproduce
-      description: A step-by-step description of how to reproduce the issue, or a link to the reproducible repository.
+      description: |
+        A detailed, step-by-step description of how to reproduce the issue is required. 
+        Please ensure your report includes clear instructions using numbered lists. 
+
+        If possible, provide a link to a repository or project where the issue can be reproduced.
       placeholder: |
         1. Create a application
         2. Click X
         3. Y will happen
+
+        Make sure to:
+        - Use numbered lists to outline steps clearly.
+        - Include all relevant commands and configurations.
+        - Provide a link to a reproducible repository if applicable.
     validations:
       required: true
   - type: textarea
     attributes:
       label: Current vs. Expected behavior
       description: A clear and concise description of what the bug is, and what you expected to happen.
-      placeholder: 'Following the steps from the previous section, I expected A to happen, but I observed B instead'
+      placeholder: "Following the steps from the previous section, I expected A to happen, but I observed B instead"
     validations:
       required: true
   - type: textarea
@@ -45,12 +54,23 @@ body:
       label: Which area(s) are affected? (Select all that apply)
       multiple: true
       options:
-        - 'Installation'
-        - 'Application'
-        - 'Databases'
-        - 'Docker Compose'
-        - 'Traefik'
-        - 'Docker'
+        - "Installation"
+        - "Application"
+        - "Databases"
+        - "Docker Compose"
+        - "Traefik"
+        - "Docker"
+        - "Remote server"
+        - "Local Development"
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Are you deploying the applications where Dokploy is installed or on a remote server?
+      options:
+        - "Same server where Dokploy is installed"
+        - "Remote server"
+        - "Both"
     validations:
       required: true
   - type: textarea
@@ -59,4 +79,13 @@ body:
       description: |
         Any extra information that might help us investigate.
       placeholder: |
-        I tested on a DigitalOcean VPS with Ubuntu 20.04 and Docker version 20.10.12.
\ No newline at end of file
+        I tested on a DigitalOcean VPS with Ubuntu 20.04 and Docker version 20.10.12.
+
+  - type: dropdown
+    attributes:
+      label: Will you send a PR to fix it?
+      description: Let us know if you are planning to submit a pull request to address this issue.
+      options:
+        - "Yes"
+        - "No"
+        - "Maybe, need help"
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index bfa9de8b..87d4e9a1 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -1,6 +1,6 @@
 name: Feature Request
 description: Suggest a new feature or improvement to the project
-labels: ['enhancement']
+labels: ["enhancement"]
 body:
   - type: textarea
     attributes:
@@ -30,4 +30,13 @@ body:
       label: Additional context
       description: Add any other context or screenshots about the feature request here.
     validations:
-      required: false
\ No newline at end of file
+      required: false
+
+  - type: dropdown
+    attributes:
+      label: Will you send a PR to implement it?
+      description: Let us know if you are planning to submit a pull request to implement this feature.
+      options:
+        - "Yes"
+        - "No"
+        - "Maybe, need help"