diff --git a/.github/workflows/comment_by_label.yml b/.github/workflows/comment_by_label.yml
deleted file mode 100644
index a00fc8f602..0000000000
--- a/.github/workflows/comment_by_label.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Comment By Label In Issues and PRs
-
-on:
-  issues:
-    types: [labeled]
-
-permissions:
-  contents: read
-
-jobs:
-  add-comment:
-    if: contains(github.event.label.name, 'Help Wanted')
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-      - name: Add comment
-        uses: peter-evans/create-or-update-comment@c9fcb64660bc90ec1cc535646af190c992007c32
-        with:
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            Due to PrimeNG team's busy roadmap, this issue is available for anyone to work on. **Make sure to reference this issue in your pull request.** :sparkles: Thank you for your contribution! :sparkles:
diff --git a/.github/workflows/issue-labeled.yml b/.github/workflows/issue-labeled.yml
index 8d7c4d62de..74d6833a25 100644
--- a/.github/workflows/issue-labeled.yml
+++ b/.github/workflows/issue-labeled.yml
@@ -23,12 +23,43 @@ jobs:
           issue-number: ${{ github.event.issue.number }}
           body: |
             We're unable to replicate your issue, if you are able to create a reproducer by using [PrimeNG Issue Template](https://stackblitz.com/github/primefaces/primeng-issue-template) or add details please edit this issue. This issue will be closed if no activities in 20 days.
+
       - name: Needs Upvote
-        if: "${{ github.event.label.name == 'Resolution: Needs Upvote :+1:'}}"
+        if: contains(github.event.label.name, 'Needs Upvote')
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'create-comment'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Thanks a lot for this issue! PrimeNG team's roadmap is busy, but community feedback is crucial in prioritization. The more upvotes help ensure this fix can be addressed quickly or the related PR can be merged soon.
+
+      - name: Needs More Information
+        if: contains(github.event.label.name, 'Needs More Information')
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'create-comment'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            More information is needed to find a solution. A runnable StackBlitz example and additional details would be helpful.
+
+      - name: Wontfix
+        if: contains(github.event.label.name, 'Wontfix')
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'create-comment'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Unfortunately, this issue cannot be fixed due to technical limitations. PrimeNg team has decided not to pursue a fix, as addressing it would introduce other complications. Thanks a lot for your understanding!
+
+      - name: Help Wanted
+        if: contains(github.event.label.name, 'Help Wanted')
         uses: actions-cool/issues-helper@v3
         with:
           actions: 'create-comment'
           token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ github.event.issue.number }}
           body: |
-             Thanks a lot for this issue! PrimeNG team's roadmap is busy, but community feedback is crucial in prioritization. The more upvotes help ensure this fix can be addressed quickly or the related PR can be merged soon.
+            Due to PrimeNG team's busy roadmap, this issue is available for anyone to work on. **Make sure to reference this issue in your pull request.** :sparkles: Thank you for your contribution! :sparkles: