diff --git a/.github/ISSUE_TEMPLATE/04_hardware_related.yml b/.github/ISSUE_TEMPLATE/04_hardware_related.yml
index 1559d15e6..ebd51287b 100644
--- a/.github/ISSUE_TEMPLATE/04_hardware_related.yml
+++ b/.github/ISSUE_TEMPLATE/04_hardware_related.yml
@@ -2,6 +2,7 @@ name: Hardware / QC / QA / selling
 description: Issues that related with hardware, quality control, quality assurance, selling, etc.
 labels:
   - question
+  - hardware problem
 body:
 - type: markdown
   attributes:
@@ -11,9 +12,6 @@ body:
       We would like to inform you that we can't provide much help regarding hardware/QC/QA/selling issues because we are not controlling various vendors/manufacturers, and also we are not profiting from you buying your device.
   
       You are still welcome to ask, but please be aware that for this kind of issue, ask the seller would be the best option.
-
-      > [!IMPORTANT]  
-      If you are a seller/vendor and your customer has directed you to this page as a reference/evidence of a "broken device" or similar issue, please be aware that we are not providing any "official guarantee of a faulty device." We are only offering suggestions based on what the submitter has stated. We do not guarantee that the device is broken or anything else.
 - type: textarea
   id: description
   attributes:
diff --git a/.github/workflows/hardware_issue_warning.yml b/.github/workflows/hardware_issue_warning.yml
new file mode 100644
index 000000000..7099730ce
--- /dev/null
+++ b/.github/workflows/hardware_issue_warning.yml
@@ -0,0 +1,20 @@
+name: Hardware Issue Warning
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  add-comment:
+    if: github.event.label.name == 'hardware problem'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - name: Add warning comment
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            > [!IMPORTANT]  
+            If you are a seller/vendor and your customer has directed you to this page as a reference/evidence of a "broken device" or similar issue, please be aware that we are not providing any "official guarantee of a faulty device." We are only offering suggestions based on what the submitter has stated. We do not guarantee that the device is broken or anything else.
\ No newline at end of file