diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index cbbfc15e6b..8104992d94 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -136,12 +136,14 @@ jobs:
           - make-target: "start-e2e-test"
             runs-on: ubuntu-20.04
             run: ${{ needs.matrix-conditionals.outputs.DEFAULT_TESTS == 'true' }}
+            fail: false
           - make-target: "start-upgrade-test"
             runs-on: ubuntu-20.04
             run: ${{ needs.matrix-conditionals.outputs.UPGRADE_TESTS == 'true' }}
           - make-target: "start-upgrade-test-light"
             runs-on: ubuntu-20.04
             run: ${{ needs.matrix-conditionals.outputs.UPGRADE_LIGHT_TESTS == 'true' }}
+            fail: true
           - make-target: "start-upgrade-import-mainnet-test"
             runs-on: buildjet-16vcpu-ubuntu-2204
             run: ${{ needs.matrix-conditionals.outputs.UPGRADE_IMPORT_MAINNET_TESTS == 'true' }}
@@ -166,6 +168,7 @@ jobs:
       make-target: ${{ matrix.make-target }}
       runs-on: ${{ matrix.runs-on}}
       run: ${{ matrix.run }}
+      fail: ${{ matrix.fail}}
     secrets: inherit
   # this allows you to set a required status check
   e2e-ok:
diff --git a/.github/workflows/reusable-e2e.yml b/.github/workflows/reusable-e2e.yml
index 5fbe273771..447778e9cb 100644
--- a/.github/workflows/reusable-e2e.yml
+++ b/.github/workflows/reusable-e2e.yml
@@ -19,6 +19,10 @@ on:
         required: true
         type: string
         default: 'ubuntu-20.04'
+      fail:
+        description: 'Whether to fail the job immediately for debugging'
+        required: false
+        type: boolean
 
 jobs:
   e2e:
@@ -28,6 +32,8 @@ jobs:
     strategy:
       fail-fast: false
     steps:
+      - if: ${{ inputs.fail }}
+        run: exit 1
       - uses: actions/checkout@v4
       
       # configure docker to use the containerd snapshotter