diff --git a/.github/actions/setup-runner-env/action.yml b/.github/actions/setup-runner-env/action.yml
index b5248736..ae701557 100644
--- a/.github/actions/setup-runner-env/action.yml
+++ b/.github/actions/setup-runner-env/action.yml
@@ -5,27 +5,30 @@ description: Setup self-hosted runner environment
 runs:
   using: composite
   steps:
+    - name: Dump env
+      shell: bash -eo pipefail {0}
+      run: echo "${{ toJSON(env) }}"
 
-    - if: env.RUNNER_ENVIRONMENT == 'github-hosted'
+    - if: env.RUNNER_ENVIRONMENT != 'self-hosted'
       name: Free up disk space
       uses: ./.github/actions/free-disk-space
       with:
         tool_cache: "${{ runner.tool_cache }}"
 
-    - if: env.RUNNER_ENVIRONMENT != 'github-hosted'
+    - if: env.RUNNER_ENVIRONMENT == 'self-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: env.RUNNER_ENVIRONMENT != 'github-hosted'
+    - if: env.RUNNER_ENVIRONMENT == 'self-hosted'
       name: Setup Node.js
       uses: actions/setup-node@v3
       with:
         node-version: '16'
 
-    - if: env.RUNNER_ENVIRONMENT == 'github-hosted'
+    - if: env.RUNNER_ENVIRONMENT != 'self-hosted'
       name: Set up QEMU
       uses: docker/setup-qemu-action@v2
 
@@ -33,7 +36,15 @@ runs:
       shell: bash
       run: docker context create builder
 
-    - name: Setup docker buildx
+    - if: env.RUNNER_ENVIRONMENT != 'self-hosted'
+      name: Setup docker buildx on github-hosted runners
+      uses: docker/setup-buildx-action@v2
+      with:
+        buildkitd-flags: --debug
+        endpoint: builder
+
+    - if: env.RUNNER_ENVIRONMENT == 'self-hosted'
+      name: Setup docker buildx on self-hosted runners
       uses: docker/setup-buildx-action@v2
       with:
         buildkitd-flags: --debug --config /etc/buildkit/buildkitd.toml