diff --git a/.github/workflows/.bazelrc.ci b/.github/workflows/.bazelrc.ci
index ec33c08..eda782b 100644
--- a/.github/workflows/.bazelrc.ci
+++ b/.github/workflows/.bazelrc.ci
@@ -6,9 +6,13 @@ build --remote_timeout=3600
 build --remote_upload_local_results
 
 # Generic remote build execution
+build:rbe --host_platform=//platforms:x86_64_linux_remote
 build:rbe --extra_execution_platforms=//platforms:x86_64_linux_remote
+build:rbe --cpu k8
+build:rbe --crosstool_top=@gcc_toolchain_x86_64//:_cc_toolchain
+build:rbe --strategy=remote
 build:rbe --genrule_strategy=remote
-build:rbe --host_platform=//platforms:x86_64_linux_remote
+build:rbe --spawn_strategy=remote
 build:rbe --jobs=32
 
 # EngFlow remote cache
diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml
index d2ba19c..38af367 100644
--- a/.github/workflows/default.yaml
+++ b/.github/workflows/default.yaml
@@ -72,7 +72,12 @@ jobs:
           ENGFLOW_PRIVATE_KEY: ${{ secrets.ENGFLOW_PRIVATE_KEY }}
   rbe:
     if: ${{ github.ref == 'refs/heads/main' }} or ${{ github.event.label.name == 'ci-test' }}
-    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        os:
+          - ubuntu-20.04
+          - macos-11
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
       - uses: bazelbuild/setup-bazelisk@v2