diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 75cd57d15..e0fdb93d1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,6 @@ jobs:
         gem install ceedling
         cd test
         ceedling test:all
-        cd ..
 
   build:
     runs-on: ubuntu-latest
@@ -40,6 +39,9 @@ jobs:
         npm install --global xpm
         xpm install --global @xpack-dev-tools/arm-none-eabi-gcc@latest
         xpm install --global @xpack-dev-tools/riscv-none-embed-gcc@latest
+        export PATH=$PATH:`echo $HOME/opt/xPacks/@xpack-dev-tools/arm-none-eabi-gcc/*/.content/bin`:`echo $HOME/opt/xPacks/@xpack-dev-tools/riscv-none-embed-gcc/*/.content/bin`
+        arm-none-eabi-gcc --version
+        riscv-none-embed-gcc --version        
     
     - name: Checkout TinyUSB
       uses: actions/checkout@v2
@@ -54,6 +56,4 @@ jobs:
     - name: Build
       run: |
         export PATH=$PATH:`echo $HOME/opt/xPacks/@xpack-dev-tools/arm-none-eabi-gcc/*/.content/bin`:`echo $HOME/opt/xPacks/@xpack-dev-tools/riscv-none-embed-gcc/*/.content/bin`
-        arm-none-eabi-gcc --version
-        riscv-none-embed-gcc --version
         python3 tools/build_all.py ${{ matrix.example }}