diff --git a/.github/workflows/e2e-validation.yml b/.github/workflows/e2e-validation.yml
index d7d26cd644..808f8c3c89 100644
--- a/.github/workflows/e2e-validation.yml
+++ b/.github/workflows/e2e-validation.yml
@@ -127,7 +127,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: cypress-tests
     environment: ${{ inputs.environment }}
-    if: ${{ failure() }} && github.ref == 'refs/heads/main' }}
+    if: ${{ failure() && github.ref == 'refs/heads/main' }}
     steps:
       - name: Download all artifacts
         uses: actions/download-artifact@v4
diff --git a/.github/workflows/run-api-test.yml b/.github/workflows/run-api-test.yml
index 1048dfed7c..c402f02fb2 100644
--- a/.github/workflows/run-api-test.yml
+++ b/.github/workflows/run-api-test.yml
@@ -111,7 +111,7 @@ jobs:
             # Check the exit code
             if [ -z "$exit_code" ]; then
               echo "Deno task succeeded [ or the orchestration failed for a totally non-valid reason ]!"
-              break
+              exit 0
             fi
 
             n=$((n+1))
@@ -145,7 +145,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: api-test
     environment: ${{ inputs.environment }}
-    if: ${{ failure() }} && github.ref == 'refs/heads/main' }}
+    if: ${{ failure() && github.ref == 'refs/heads/main' }}
     steps:
       - name: Download all artifacts
         uses: actions/download-artifact@v4