diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 12bd44f8..c3dae1a9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,6 @@
 name: "🐞 Script Issue Report"
 description: Report a specific issue with a script. For other inquiries, please use the Discussions section.
-
+labels: ["bug"]
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index e9a13bc4..c38d4d6e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,7 +3,7 @@ contact_links:
     - name: 🤔 Questions and Help
       url: https://github.com/community-scripts/ProxmoxVE/discussions
       about: For suggestions or questions, please use the Discussions section.
-    - name: 🌟 Feature request
+    - name: 🌟 new Script request
       url: https://github.com/community-scripts/ProxmoxVE/discussions/new?category=request-script
       about: For feature/script requests, please use the Discussions section.
     - name: 💻 Discord
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000..7f065275
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,33 @@
+name: "✨ Feature Request"
+description: "Suggest a new feature or enhancement."
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # ✨ **Feature Request**
+        Have an idea for a new feature? Share your thoughts below!
+
+  - type: input
+    id: feature_summary
+    attributes:
+      label: "🌟 Briefly describe the feature"
+      placeholder: "e.g., Add support for XYZ"
+    validations:
+      required: true
+
+  - type: textarea
+    id: feature_description
+    attributes:
+      label: "📝 Detailed description"
+      placeholder: "Explain the feature in detail"
+    validations:
+      required: true
+
+  - type: textarea
+    id: use_case
+    attributes:
+      label: "💡 Why is this useful?"
+      placeholder: "Describe the benefit of this feature"
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/task.yml b/.github/ISSUE_TEMPLATE/task.yml
new file mode 100644
index 00000000..bf556929
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/task.yml
@@ -0,0 +1,25 @@
+name: "🛠️ Task / General Request"
+description: "Request a general task, improvement, or refactor."
+labels: ["task"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # 🛠️ **Task / General Request**
+        Request a task that isn't a bug or feature request.
+
+  - type: input
+    id: task_summary
+    attributes:
+      label: "📌 Task summary"
+      placeholder: "e.g., Refactor XYZ"
+    validations:
+      required: true
+
+  - type: textarea
+    id: task_details
+    attributes:
+      label: "📋 Task details"
+      placeholder: "Explain what needs to be done"
+    validations:
+      required: true