diff --git a/.github/workflows/comments.yml b/.github/workflows/comments.yml
index 5d1aa23df74d..40fdfeab3a39 100644
--- a/.github/workflows/comments.yml
+++ b/.github/workflows/comments.yml
@@ -33,7 +33,8 @@ jobs:
         uses: peter-evans/create-or-update-project-card@v2
         if: |
           (github.actor != 'bitnami-bot' || github.event.issue.user.login != 'bitnami-bot' || github.event.issue.pull_request == null) &&
-          (!contains(github.event.issue.labels.*.name, 'bitnami')) && contains(fromJson(env.BITNAMI_TEAM), github.actor)
+          contains(fromJson(env.BITNAMI_TEAM), github.actor) &&
+          (!contains(github.event.issue.labels.*.name, 'bitnami'))
         with:
           project-name: Support
           column-name: Pending
@@ -41,7 +42,8 @@ jobs:
         uses: peter-evans/create-or-update-project-card@v2
         if: |
           (github.actor != 'bitnami-bot' || github.event.issue.user.login != 'bitnami-bot' || github.event.issue.pull_request == null) &&
-          contains(github.event.issue.labels.*.name, 'in-progress') && (!contains(fromJson(env.BITNAMI_TEAM), github.actor))
+          (!contains(fromJson(env.BITNAMI_TEAM), github.actor)) &&
+          contains(github.event.issue.labels.*.name, 'in-progress')
         with:
           project-name: Support
           column-name: In progress
@@ -49,7 +51,8 @@ jobs:
         uses: peter-evans/create-or-update-project-card@v2
         if: |
           (github.actor != 'bitnami-bot' || github.event.issue.user.login != 'bitnami-bot' || github.event.issue.pull_request == null) &&
-          ((contains(github.event.issue.labels.*.name, 'triage')) || (contains(github.event.issue.labels.*.name, 'solved'))) && (!contains(fromJson(env.BITNAMI_TEAM), github.actor))
+          (!contains(fromJson(env.BITNAMI_TEAM), github.actor)) &&
+          (!contains(github.event.issue.labels.*.name, 'in-progress'))
         with:
           project-name: Support
           column-name: Triage