diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 358e90b4..b528c9d9 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,4 +3,7 @@ contact_links:
     - 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: 🐞 Script Issue Report
+      url: https://github.com/community-scripts/ProxmoxVED/issues?q=is%3Aissue+is%3Aopen+label%3Atask
+      about: Found a bug in a script? Find the script's issue in the list and leave a comment there — do NOT open a new issue.
 
diff --git a/.github/ISSUE_TEMPLATE/general-issue.yaml b/.github/ISSUE_TEMPLATE/general-issue.yaml
deleted file mode 100644
index 2477a6d1..00000000
--- a/.github/ISSUE_TEMPLATE/general-issue.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-name: "🐞 Script Issue Report"
-description: Report a general Issue regarding the DEV Repo.
-labels: ["bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-
-        Thank you for taking the time to report an issue! Please provide as much detail as possible to help us address the problem efficiently.  
-
-        ## ⚠️ **IMPORTANT - READ FIRST**  
-        - 🔍 **Search first:** Before submitting, check if the issue has already been reported or resolved in [closed issues](https://github.com/community-scripts/ProxmoxVED/issues?q=is%3Aissue+is%3Aclosed). If found, comment on that issue instead of creating a new one.
-        - 🛠️ **Supported environments only:** Ensure you are using a default Linux distribution. Custom setups may not be supported.  
-        - 💡 For general questions, feature requests, or suggestions, use the [Discussions section](https://github.com/community-scripts/ProxmoxVE/discussions) in the Main Repository.  
-        
-  - type: input
-    id: guidelines
-    attributes:
-      label: ✅ Have you read and understood the above guidelines?
-      placeholder: "yes"
-    validations:
-      required: true
-
-  - type: input
-    id: script_name
-    attributes:
-      label: 📜 What is the name of the script you are using, or where do you have Problems?
-      placeholder: "e.g., NextcloudPi, Zigbee2MQTT, Website"
-    validations:
-      required: true
-
-
-  - type: textarea
-    id: issue_description
-    attributes:
-      label: 📝 Provide a clear and concise description of the issue.
-    validations:
-      required: true
-
-  - type: textarea
-    id: steps_to_reproduce
-    attributes:
-      label: 🔄 Steps to reproduce the issue.
-      placeholder: "e.g., Step 1: ..., Step 2: ..."
-    validations:
-      required: true
-
-  - type: textarea
-    id: error_output
-    attributes:
-      label: ❌ Paste the full error output (if available).
-      placeholder: "Include any relevant logs or error messages."
-    validations:
-      required: true
-
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: 🖼️ Additional context (optional).
-      placeholder: "Include screenshots, code blocks (use triple backticks ```), or any other relevant information."
-    validations:
-      required: false