diff --git a/.github/workflows/tugboat.yml b/.github/workflows/tugboat.yml
index 3d6980c81e..fdb2e1ddc4 100644
--- a/.github/workflows/tugboat.yml
+++ b/.github/workflows/tugboat.yml
@@ -80,7 +80,20 @@ jobs:
       - name: echo tugboat preview url
         run: |
           curl ${{steps.get-status-env.outputs.result}}
-          # Update the commit status with a fail or success.
+      - name: set status
+        if: ${{ failure() }}
+        uses: actions/github-script@v3
+        with:
+          github-token: ${{secrets.GH_SERVICE_ACCOUNT_TOKEN}}
+          script: |
+            return github.repos.createCommitStatus({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              sha: context.sha,
+              state: "error",
+              context: 'Backstage Tugboat E2E Tests',
+              target_url: "https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}"
+            });
       - name: set status
         if: ${{ success() }}
         uses: actions/github-script@v3
@@ -95,17 +108,3 @@ jobs:
               context: 'Backstage Tugboat E2E Tests',
               target_url: "https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}"
             });
-      - name: set status
-        if: ${{ failure() }} || ${{ cancelled() }}
-        uses: actions/github-script@v3
-        with:
-          github-token: ${{secrets.GH_SERVICE_ACCOUNT_TOKEN}}
-          script: |
-            return github.repos.createCommitStatus({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              sha: context.sha,
-              state: "error",
-              context: 'Backstage Tugboat E2E Tests',
-              target_url: "https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}"
-            });