diff --git a/.github/workflows/ci-dispatch-job.yml b/.github/workflows/ci-dispatch-job.yml
index 22eb78071c3..1bafe93df23 100644
--- a/.github/workflows/ci-dispatch-job.yml
+++ b/.github/workflows/ci-dispatch-job.yml
@@ -40,7 +40,7 @@ permissions:
 jobs:
   linux:
     name: ${{inputs.name}}
-    continue-on-error: ${{ ! startsWith(inputs.dispatch, 'linux') }}
+    # continue-on-error: ${{ ! startsWith(inputs.dispatch, 'linux') }}
     outputs:
       success: ${{ steps.done.outputs.SUCCESS }}
     permissions:
@@ -98,7 +98,7 @@ jobs:
 
   windows:
     name: ${{inputs.name}}
-    continue-on-error: ${{ ! startsWith(inputs.dispatch, 'windows') }}
+    # continue-on-error: ${{ ! startsWith(inputs.dispatch, 'windows') }}
     outputs:
       success: ${{ steps.done.outputs.SUCCESS }}
     permissions:
diff --git a/.github/workflows/ci-dispatch-two-stage.yml b/.github/workflows/ci-dispatch-two-stage.yml
index ba627af4373..0ac72dd1ee4 100644
--- a/.github/workflows/ci-dispatch-two-stage.yml
+++ b/.github/workflows/ci-dispatch-two-stage.yml
@@ -37,7 +37,7 @@ jobs:
   consumers:
     needs: producers
     # dispatch-job's result is always false, check the outputs instead. See ci-dispatch-job.yml for more information.
-    if: ${{ failure() && !cancelled() && needs.producers.outputs.success }}
+    if: ${{ !cancelled() && fromJson(needs.producers.outputs.success) }}
     permissions:
       id-token: write
       contents: read