diff --git a/.github/actions/devcontainer-json/action.yml b/.github/actions/devcontainer-json/action.yml
index 2185dde1..e7824577 100644
--- a/.github/actions/devcontainer-json/action.yml
+++ b/.github/actions/devcontainer-json/action.yml
@@ -21,8 +21,8 @@ runs:
   using: composite
   steps:
 
-    - name: Setup Node.js
-      if: contains(runner.name, 'linux-') == true
+    - if: env.RUNNER_ENVIRONMENT != 'github-hosted'
+      name: Setup Node.js
       uses: actions/setup-node@v3
       with:
         node-version: '16'
diff --git a/.github/actions/setup-runner-env/action.yml b/.github/actions/setup-runner-env/action.yml
index f0f98ee7..b5248736 100644
--- a/.github/actions/setup-runner-env/action.yml
+++ b/.github/actions/setup-runner-env/action.yml
@@ -6,26 +6,26 @@ runs:
   using: composite
   steps:
 
-    - if: contains(runner.name, 'linux-') != true
+    - if: env.RUNNER_ENVIRONMENT == 'github-hosted'
       name: Free up disk space
       uses: ./.github/actions/free-disk-space
       with:
         tool_cache: "${{ runner.tool_cache }}"
 
-    - if: contains(runner.name, 'linux-') == true
+    - if: env.RUNNER_ENVIRONMENT != 'github-hosted'
       name: Setup self-hosted runner environment
       shell: bash -eo pipefail {0}
       run: |
         echo "HOME=${{ runner.workspace }}" >> $GITHUB_ENV;
         echo "TMPDIR=${{ runner.temp }}" >> $GITHUB_ENV;
 
-    - if: contains(runner.name, 'linux-') == true
+    - if: env.RUNNER_ENVIRONMENT != 'github-hosted'
       name: Setup Node.js
       uses: actions/setup-node@v3
       with:
         node-version: '16'
 
-    - if: contains(runner.name, 'linux-') != true
+    - if: env.RUNNER_ENVIRONMENT == 'github-hosted'
       name: Set up QEMU
       uses: docker/setup-qemu-action@v2