diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 170f73fae..060129d0f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,7 +59,7 @@ jobs:
         toolchain:
           # - 'arm-clang' is built by circle-ci in PR
           - 'aarch64-gcc'
-          - 'arm-gcc'
+#          - 'arm-gcc'
           - 'msp430-gcc'
           - 'riscv-gcc'
     with:
@@ -72,7 +72,7 @@ jobs:
   # Build Make (built by circle-ci in PR, only build on push here)
   # ---------------------------------------
   make:
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' && false
     needs: set-matrix
     uses: ./.github/workflows/build_util.yml
     strategy:
@@ -113,7 +113,7 @@ jobs:
   # Build IAR on HFP self-hosted
   # ---------------------------------------
   arm-iar:
-    if: github.repository_owner == 'hathach' && github.event_name == 'push'
+    if: github.repository_owner == 'hathach' && github.event_name == 'push' && false
     needs: set-matrix
     runs-on: [self-hosted, Linux, X64, hifiphile]
     env:
@@ -137,3 +137,24 @@ jobs:
 
       - name: Build
         run: python3 tools/build.py --one-per-family --toolchain iar $BUILD_ARGS
+
+  # ---------------------------------------
+  # Zephyr
+  # ---------------------------------------
+  zephyr:
+    if: github.event_name == 'push'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout TinyUSB
+        uses: actions/checkout@v4
+
+      - name: Setup Zephyr project
+        uses: zephyrproject-rtos/action-zephyr-setup@v1
+        with:
+          app-path: examples
+          toolchains: arm-zephyr-eabi
+
+      - name: Build
+        run: |
+          west build -b pca10056 examples/device/cdc_msc
+          west build -b pca10056 examples/device/msc_dual_lun
diff --git a/.west/config b/.west/config
deleted file mode 100644
index 2518007f6..000000000
--- a/.west/config
+++ /dev/null
@@ -1,6 +0,0 @@
-[manifest]
-path = examples
-file = west.yml
-
-[zephyr]
-base = lib/zephyr
diff --git a/examples/west.yml b/examples/west.yml
index 383815c45..0683f6861 100644
--- a/examples/west.yml
+++ b/examples/west.yml
@@ -6,7 +6,7 @@ manifest:
     - name: zephyr
       remote: zephyrproject-rtos
       revision: main
-      path: lib/zephyr
+      path: zephyr
       import: true
   self:
     path: .
diff --git a/hw/bsp/family_support.cmake b/hw/bsp/family_support.cmake
index 6ba7cb1c7..14916f771 100644
--- a/hw/bsp/family_support.cmake
+++ b/hw/bsp/family_support.cmake
@@ -75,7 +75,7 @@ endif()
 
 if (BUILD_ZEPHYR)
   set(BOARD_ROOT ${TOP}/hw/bsp/${FAMILY})
-  find_package(Zephyr REQUIRED HINTS ${TOP}/lib/zephyr)
+  find_package(Zephyr REQUIRED HINTS ${TOP}/zephyr)
 endif ()
 
 #-------------------------------------------------------------