diff --git a/.github/workflows/cpp_package.yaml b/.github/workflows/cpp_package.yaml
index 80f34c0fa86c..5a2f61e146cc 100644
--- a/.github/workflows/cpp_package.yaml
+++ b/.github/workflows/cpp_package.yaml
@@ -122,7 +122,8 @@ jobs:
         strategy:
             matrix:
                 target: [riscv32imafc-esp-espidf]
-                host: [ubuntu-20.04]
+                host: [ubuntu-20.04, windows-2022, macOS-12]
+            fail-fast: false
 
         runs-on: ${{ matrix.host }}
         steps:
@@ -131,11 +132,15 @@ jobs:
               with:
                   old-ubuntu: true
             - uses: dtolnay/rust-toolchain@stable
-            - uses: esp-rs/xtensa-toolchain@v1.5
-              with:
-                  default: true
-                  buildtargets: esp32
-                  ldproxy: false
+            - id: install espup
+              run: |
+                  cargo install espup
+                  espup install
+            - id: add esp toolchains to PATH
+              if: runner.os == 'Linux'
+              run: |
+                  source "$HOME/exports"
+                  echo "$PATH" >> "$GITHUB_PATH"
   #           - uses: baptiste0928/cargo-install@v3
   #             with:
   #                 crate: cargo-about