diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index ef1e8d2357..c8d5dc7cf3 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -144,5 +144,6 @@ jobs:
           GH_TOKEN: ${{ github.token }}
           GH_DEBUG: api
         run: |
-          gh workflow run retry_build.yml \
-            -F run_id=${{ github.run_id }}
+          echo Disabled auto retry workflow
+          # gh workflow run retry_build.yml \
+          #   -F run_id=${{ github.run_id }}
diff --git a/.github/workflows/retry_build.yml b/.github/workflows/retry_build.yml
index 603ae5aab6..ff4e944adf 100644
--- a/.github/workflows/retry_build.yml
+++ b/.github/workflows/retry_build.yml
@@ -15,11 +15,16 @@ jobs:
           GH_TOKEN: ${{ github.token }}
           GH_DEBUG: api
         run: |
-          gh run watch ${{ inputs.run_id }} > /dev/null 2>&1
+          while gh run view ${{ inputs.run_id }} --json status | grep -q in_progress
+          do
+            echo Workflow in progress - sleeping for 10 minutes then checking again
+            sleep 10m
+          done
 
           # Only retry if there are failed jobs
           if gh run view ${{ inputs.run_id }} --exit-status; then
             echo Workflow succeeded - no retry necessary.
           else
+            echo Workflow failed - initiating retry.
             gh run rerun ${{ inputs.run_id }} --failed
           fi