diff --git a/.github/workflows/dashboard-e2e.yml b/.github/workflows/dashboard-e2e.yml
index 7f6b3889c..4d1b3d50a 100644
--- a/.github/workflows/dashboard-e2e.yml
+++ b/.github/workflows/dashboard-e2e.yml
@@ -39,8 +39,8 @@ jobs:
       - name: test
         uses: nick-fields/retry@v2
         with:
+          timeout_minutes: 20
           max_attempts: 3
-          retry_on: error
           command: |
             . /rmf_demos_ws/install/setup.bash
             pnpm test
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 7f05ab244..7f6a557ac 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -47,8 +47,8 @@ jobs:
       - name: test
         uses: nick-fields/retry@v2
         with:
+          timeout_minutes: 20
           max_attempts: 3
-          retry_on: error
           command: |
             . /rmf_demos_ws/install/setup.bash
             pnpm test