diff --git a/.github/workflows/nightly-e2e-tests-subtensor-main.yml b/.github/workflows/nightly-e2e-tests-subtensor-main.yml
index b0bc94295c..e01443fde8 100644
--- a/.github/workflows/nightly-e2e-tests-subtensor-main.yml
+++ b/.github/workflows/nightly-e2e-tests-subtensor-main.yml
@@ -156,11 +156,13 @@ jobs:
             status=$?
             if [ $status -eq 0 ]; then
               echo "✅ Tests passed on attempt $i"
+              echo "failed=false" >> "$GITHUB_OUTPUT"
               break
             else
               echo "❌ Tests failed on attempt $i"
               if [ $i -eq 3 ]; then
                 echo "Tests failed after 3 attempts"
+                echo "failed=true" >> "$GITHUB_OUTPUT"
                 exit 1
               fi
               echo "Retrying..."
@@ -168,11 +170,6 @@ jobs:
             fi
           done
 
-      - name: Set fail flag
-        if: failure()
-        id: set-fail
-        run: echo "failed=true" >> "$GITHUB_OUTPUT"
-
   # Daily run of fast-blocks tests from `bittensor:staging` based on `subtensor:devnet-ready` docker image
   run-fast-blocks-e2e-test-staging:
     name: "FB staging: ${{ matrix.test-file }} / Python ${{ matrix.python-version }}"
@@ -229,11 +226,13 @@ jobs:
             status=$?
             if [ $status -eq 0 ]; then
               echo "✅ Tests passed on attempt $i"
+              echo "failed=false" >> "$GITHUB_OUTPUT"
               break
             else
               echo "❌ Tests failed on attempt $i"
               if [ $i -eq 3 ]; then
                 echo "Tests failed after 3 attempts"
+                echo "failed=true" >> "$GITHUB_OUTPUT"
                 exit 1
               fi
               echo "Retrying..."
@@ -241,11 +240,6 @@ jobs:
             fi
           done
 
-      - name: Set fail flag
-        if: failure()
-        id: set-fail
-        run: echo "failed=true" >> "$GITHUB_OUTPUT"
-
   # Saturday run of non-fast-blocks tests from `bittensor:master` based on `subtensor:main` docker image
   run-non-fast-blocks-e2e-test-master:
     if: needs.check-if-non-fast-blocks-run.outputs.non-fast-blocks-run == 'true'
@@ -305,11 +299,13 @@ jobs:
             status=$?
             if [ $status -eq 0 ]; then
               echo "✅ Tests passed on attempt $i"
+              echo "failed=false" >> "$GITHUB_OUTPUT"
               break
             else
               echo "❌ Tests failed on attempt $i"
               if [ $i -eq 3 ]; then
                 echo "Tests failed after 3 attempts"
+                echo "failed=true" >> "$GITHUB_OUTPUT"
                 exit 1
               fi
               echo "Retrying..."
@@ -317,11 +313,6 @@ jobs:
             fi
           done
 
-      - name: Set fail flag
-        if: failure()
-        id: set-fail
-        run: echo "failed=true" >> "$GITHUB_OUTPUT"
-
   # Saturday run of non-fast-blocks tests from `bittensor:staging` based on `subtensor:devnet-ready` docker image
   run-non-fast-blocks-e2e-test-staging:
     if: needs.check-if-non-fast-blocks-run.outputs.non-fast-blocks-run == 'true'
@@ -381,21 +372,19 @@ jobs:
             status=$?
             if [ $status -eq 0 ]; then
               echo "✅ Tests passed on attempt $i"
+              echo "failed=false" >> "$GITHUB_OUTPUT"
               break
             else
               echo "❌ Tests failed on attempt $i"
               if [ $i -eq 3 ]; then
                 echo "Tests failed after 3 attempts"
+                echo "failed=true" >> "$GITHUB_OUTPUT"
                 exit 1
               fi
               echo "Retrying..."
               sleep 5
             fi
           done
-      - name: Set fail flag
-        if: failure()
-        id: set-fail
-        run: echo "failed=true" >> "$GITHUB_OUTPUT"
 
   # Send centralized Discord failure notification
   notify-on-failure: