diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index d6a201fd728..e71a05d3c32 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -57,7 +57,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Get latest version of stable Rust
-      if: env.SELF_HOSTED_RUNNERS == false
+      if: !(startsWith(env.RUNNER_NAME, 'runner-'))
       uses: actions-rs/toolchain@v1
       with:
           toolchain: stable
@@ -72,19 +72,19 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Get latest version of stable Rust
-      if: env.SELF_HOSTED_RUNNERS == false
+      if: !(startsWith(env.RUNNER_NAME, 'runner-'))
       uses: actions-rs/toolchain@v1
       with:
           toolchain: stable
           override: true
           components: rustfmt
     - name: Install Foundry (anvil)
-      if: env.SELF_HOSTED_RUNNERS == false
+      if: !(startsWith(env.RUNNER_NAME, 'runner-'))
       uses: foundry-rs/foundry-toolchain@v1
       with:
         version: nightly-ca67d15f4abd46394b324c50e21e66f306a1162d
     - name: Install nexttest for linux
-      if: env.SELF_HOSTED_RUNNERS == false
+      if: !(startsWith(env.RUNNER_NAME, 'runner-'))
       run: curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
     - name: Run tests in release
       run: make nextest-release
@@ -311,20 +311,20 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Get latest version of stable Rust
-      if: env.SELF_HOSTED_RUNNERS == false
+      if: !(startsWith(env.RUNNER_NAME, 'runner-'))
       uses: actions-rs/toolchain@v1
       with:
           toolchain: stable
           override: true
           components: rustfmt
     - name: Install geth
-      if: env.SELF_HOSTED_RUNNERS == false
+      if: !(startsWith(env.RUNNER_NAME, 'runner-'))
       run: |
           sudo add-apt-repository -y ppa:ethereum/ethereum
           sudo apt-get update
           sudo apt-get install ethereum
     - name: Install lighthouse and lcli
-      if: env.SELF_HOSTED_RUNNERS == false
+      if: !(startsWith(env.RUNNER_NAME, 'runner-'))
       run: |
           make
           make install-lcli