diff --git a/.github/workflows/removed_runner.yml b/.github/workflows/removed_runner.yml
index ff6ea29..6b91d79 100644
--- a/.github/workflows/removed_runner.yml
+++ b/.github/workflows/removed_runner.yml
@@ -22,7 +22,7 @@ jobs:
     steps:
       - name: List runners
         run: |
-          echo "RUNNERS_FOUND=$(gh api "repos/zama-ai/slab-github-runner/actions/runners" --jq '.runners[].name')" >> "${GITHUB_ENV}"
+          echo "RUNNERS_FOUND=$(gh api "repos/zama-ai/slab-github-runner/actions/runners" | jq -r '.runners[].name')" >> "${GITHUB_ENV}"
         env:
           GH_TOKEN: ${{ secrets.READ_REPO_TOKEN }}
 
diff --git a/.github/workflows/test_spawn_terminate.yml b/.github/workflows/test_spawn_terminate.yml
index 1b3eaf0..d8ebcb1 100644
--- a/.github/workflows/test_spawn_terminate.yml
+++ b/.github/workflows/test_spawn_terminate.yml
@@ -82,12 +82,22 @@ jobs:
           job-secret: ${{ secrets.JOB_SECRET }}
           label: ${{ matrix.runner }}
 
-  test-runner-removed:
-    name: Test runner is removed
-    needs: [ action-stop ]
+  test-runner-removed-aws:
+    name: Test runner is removed (AWS)
+    needs: [ action-start, action-stop ]
     uses: ./.github/workflows/removed_runner.yml
     with:
-      runner-name: ci-persistent-runner
+      runner-name: ${{ needs.action-start.outputs.runner-aws }}
+      must-exist: false
+    secrets:
+      READ_REPO_TOKEN: ${{ secrets.SLAB_ACTION_TOKEN }}
+
+  test-runner-removed-hyperstack:
+    name: Test runner is removed (Hyperstack)
+    needs: [ action-start, action-stop ]
+    uses: ./.github/workflows/removed_runner.yml
+    with:
+      runner-name: ${{ needs.action-start.outputs.runner-hyperstack }}
       must-exist: false
     secrets:
       READ_REPO_TOKEN: ${{ secrets.SLAB_ACTION_TOKEN }}