diff --git a/.github/workflows/ohos.yml b/.github/workflows/ohos.yml
index d1b26fe8520..25170c37295 100644
--- a/.github/workflows/ohos.yml
+++ b/.github/workflows/ohos.yml
@@ -151,12 +151,77 @@ jobs:
       dromaeo: false
     secrets: inherit
 
+  # Generate a unique id that allows the timeout
+  # jobs to find the workload job run (via the job’s friendly name), even
+  # if there are multiple instances in the workflow call tree.
+  gen-uuids:
+    name: Generate unique runner IDs
+    runs-on: ubuntu-latest
+    outputs:
+      # re-use the same uuid for build, test, bench, with a prefix
+      build-unique-id: build-${{ steps.uuid.outputs.unique_id }}
+      test-unique-id: test-${{ steps.uuid.outputs.unique_id }}
+      bench-unique-id: bench-${{ steps.uuid.outputs.unique_id }}
+    steps:
+      - name: Generate a UUID
+        id: uuid
+        run: |
+          set -euo pipefail
+          unique_id=$(uuidgen)
+          echo "unique_id=$unique_id" | tee -a $GITHUB_OUTPUT
+
+  timeout-build:
+    name: Timeout for build-harmonyos-aarch64
+    needs:
+      - gen-uuids
+    env:
+      UNIQUE_ID: '${{ needs.gen-uuids.outputs.build-unique-id }}'
+      TIMEOUT: '600'
+      GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+      RUN_URL: '/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}'
+      SLEEP_PER_ITERATION: '15'
+    runs-on: ubuntu-latest
+    # Note: We copy-paste the steps here to avoid the 20 workflow limit of github.
+    # Todo: In the future we should check if we could move this to a composite-action.
+    steps:
+      - name: Cancel if workload job is still queued
+        run: |
+          num_iterations=$(( TIMEOUT / SLEEP_PER_ITERATION ))
+          echo "Will check every ${SLEEP_PER_ITERATION}, in total ${num_iterations} times"
+          for i in $(seq 1 ${num_iterations})
+          do
+            # Wait for a bit between each API call
+            echo "Sleep for ${SLEEP_PER_ITERATION}"
+            sleep ${SLEEP_PER_ITERATION}
+            job_status=$(gh api "${RUN_URL}/jobs" \
+             | jq -er --arg id "${UNIQUE_ID}" \
+               '.jobs[] | select(.name | contains("[" + $id + "]")) | .status')
+            echo "Job status is ${job_status}."
+            if [ "${job_status}" != queued ]; then
+             echo 'Job is not queued anymore. Exiting timeout job'
+             exit 0
+            else
+             echo "Retrying..."
+            fi
+          done
+          echo 'Timeout waiting for runner assignment!'
+          echo 'Hint: does this repo have permission to access the runner group?'
+          echo 'Hint: https://github.com/organizations/servo/settings/actions/runner-groups'
+          echo 'Note: This might happen sporadically if there are a lot of concurrent jobs'
+          echo 'which are competing for the limited number of self-hosted runners'
+          echo
+          echo 'Cancelling workflow run'
+          gh api "$run_url/cancel" --method POST
+          exit 1
+
   # Note: We could potentially also merge this build job with the above one,
   # if we figure out how to make hvigor build for harmonyos without the HOS commandline-tools installed.
   build-harmonyos-aarch64:
-    name: HarmonyOS Build (aarch64)
+    name: HarmonyOS Build ${{ inputs.profile }} aarch64 [${{ needs.gen-uuids.outputs.build-unique-id }}]
     continue-on-error: true
     runs-on: hos-builder
+    needs:
+      - gen-uuids
     if: github.repository == 'servo/servo'
     steps:
       - if: ${{ github.event_name != 'pull_request_target' }}
@@ -177,15 +242,60 @@ jobs:
           name: servoshell-hos-${{ inputs.profile }}.hap
           path: target/openharmony/aarch64-unknown-linux-ohos/${{ inputs.profile }}/entry/build/harmonyos/outputs/default/servoshell-default-unsigned.hap
 
+  timeout-test:
+    name: Timeout for test-harmonyos-aarch64
+    needs:
+      - gen-uuids
+      - build-harmonyos-aarch64
+    env:
+      UNIQUE_ID: '${{ needs.gen-uuids.outputs.test-unique-id }}'
+      TIMEOUT: '600'
+      GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+      RUN_URL: '/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}'
+      SLEEP_PER_ITERATION: '15'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel if workload job is still queued
+        run: |
+          num_iterations=$(( TIMEOUT / SLEEP_PER_ITERATION ))
+          echo "Will check every ${SLEEP_PER_ITERATION}, in total ${num_iterations} times"
+          for i in $(seq 1 ${num_iterations})
+          do
+            # Wait for a bit between each API call
+            echo "Sleep for ${SLEEP_PER_ITERATION}"
+            sleep ${SLEEP_PER_ITERATION}
+            job_status=$(gh api "${RUN_URL}/jobs" \
+             | jq -er --arg id "${UNIQUE_ID}" \
+               '.jobs[] | select(.name | contains("[" + $id + "]")) | .status')
+            echo "Job status is ${job_status}."
+            if [ "${job_status}" != queued ]; then
+             echo 'Job is not queued anymore. Exiting timeout job'
+             exit 0
+            else
+             echo "Retrying..."
+            fi
+          done
+          echo 'Timeout waiting for runner assignment!'
+          echo 'Hint: does this repo have permission to access the runner group?'
+          echo 'Hint: https://github.com/organizations/servo/settings/actions/runner-groups'
+          echo 'Note: This might happen sporadically if there are a lot of concurrent jobs'
+          echo 'which are competing for the limited number of self-hosted runners'
+          echo
+          echo 'Cancelling workflow run'
+          gh api "$run_url/cancel" --method POST
+          exit 1
+
   test-harmonyos-aarch64:
-    name: Test HarmonyOS aarch64
+    name: Test HarmonyOS aarch64 ${{ inputs.profile }} [${{ needs.gen-uuids.outputs.test-unique-id }}]
     # Don't block servos Merge queue on this job failing.
     # Since we just added this, there might be some hidden issues,
     # so in the beginning we will just do a best effort approach but ignore errors.
     continue-on-error: true
     runs-on: hos-runner
     if: github.repository == 'servo/servo'
-    needs: build-harmonyos-aarch64
+    needs:
+      - build-harmonyos-aarch64
+      - gen-uuids
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -241,11 +351,56 @@ jobs:
           # If the grep fails, then the trace output for the "page loaded" prompt is missing
           grep 'org\.servo\.servo-.* tracing_mark_write.*PageLoadEndedPrompt' test_output/servo.ftrace
 
+  timeout-bench:
+    name: Timeout for bench-harmonyos-aarch64
+    needs:
+      - gen-uuids
+      - test-harmonyos-aarch64
+    env:
+      UNIQUE_ID: '${{ needs.gen-uuids.outputs.bench-unique-id }}'
+      TIMEOUT: '600'
+      GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+      RUN_URL: '/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}'
+      SLEEP_PER_ITERATION: '15'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel if workload job is still queued
+        run: |
+          num_iterations=$(( TIMEOUT / SLEEP_PER_ITERATION ))
+          echo "Will check every ${SLEEP_PER_ITERATION}, in total ${num_iterations} times"
+          for i in $(seq 1 ${num_iterations})
+          do
+            # Wait for a bit between each API call
+            echo "Sleep for ${SLEEP_PER_ITERATION}"
+            sleep ${SLEEP_PER_ITERATION}
+            job_status=$(gh api "${RUN_URL}/jobs" \
+             | jq -er --arg id "${UNIQUE_ID}" \
+               '.jobs[] | select(.name | contains("[" + $id + "]")) | .status')
+            echo "Job status is ${job_status}."
+            if [ "${job_status}" != queued ]; then
+             echo 'Job is not queued anymore. Exiting timeout job'
+             exit 0
+            else
+             echo "Retrying..."
+            fi
+          done
+          echo 'Timeout waiting for runner assignment!'
+          echo 'Hint: does this repo have permission to access the runner group?'
+          echo 'Hint: https://github.com/organizations/servo/settings/actions/runner-groups'
+          echo 'Note: This might happen sporadically if there are a lot of concurrent jobs'
+          echo 'which are competing for the limited number of self-hosted runners'
+          echo
+          echo 'Cancelling workflow run'
+          gh api "$run_url/cancel" --method POST
+          exit 1
+
   bench-harmonyos-aarch64:
-    name: Benching HarmonyOS aarch64
+    name: Benching HarmonyOS aarch64 ${{ inputs.profile }} [${{ needs.gen-uuids.outputs.bench-unique-id }}]
     continue-on-error: true
     runs-on: hos-runner
-    needs: test-harmonyos-aarch64
+    needs:
+      - test-harmonyos-aarch64
+      - gen-uuids
     if: github.repository == 'servo/servo'
     steps:
       - uses: actions/download-artifact@v4