diff --git a/.github/workflows/staging-tests.yml b/.github/workflows/staging-tests.yml
index c173812a7..8e5c6a261 100644
--- a/.github/workflows/staging-tests.yml
+++ b/.github/workflows/staging-tests.yml
@@ -18,7 +18,6 @@ on:
 
 jobs:
   tests:
-    runs-on: [self-hosted, bw-${{ inputs.TYPE }}]
     steps:
       # Prepare
       - name: Checkout source code
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 7bc26bdd9..35e32a499 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -164,6 +164,7 @@ jobs:
   # Perform tests
   tests-docker:
     needs: [infra-create-docker]
+    runs-on: [self-hosted, bw-docker]
     uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging
     with:
       TYPE: docker
@@ -174,6 +175,7 @@ jobs:
       ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
   tests-autoconf:
     needs: [infra-create-autoconf]
+    runs-on: [self-hosted, bw-autoconf]
     uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging
     with:
       TYPE: autoconf
@@ -184,6 +186,7 @@ jobs:
       ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
   tests-swarm:
     needs: [infra-create-swarm]
+    runs-on: [self-hosted, bw-swarm]
     uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging
     with:
       TYPE: swarm
@@ -194,6 +197,7 @@ jobs:
       ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
   tests-k8s:
     needs: [infra-create-k8s]
+    runs-on: [ubuntu-latest]
     uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging
     with:
       TYPE: k8s
@@ -204,6 +208,7 @@ jobs:
       ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
   tests-linux:
     needs: [infra-create-k8s]
+    runs-on: [self-hosted, bw-linux]
     uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging
     with:
       TYPE: linux