diff --git a/.github/workflows/build_and_lint_pr.yml b/.github/workflows/build_and_lint_pr.yml
index c3a0d89bf5..ea25a83cdc 100644
--- a/.github/workflows/build_and_lint_pr.yml
+++ b/.github/workflows/build_and_lint_pr.yml
@@ -17,21 +17,7 @@ jobs:
         # This job matrix will generate a separate job for all platforms listed.
         # Add platforms in alphabetical order.
         platform: [
-          at-cb,
-          at-mc,
-          gt-cc,
-          wc-mb,
-          yv3-dl,
-          yv3-vf,
-          yv35-bb, 
-          yv35-cl, 
-          yv35-gl, 
-          yv35-hd,
-          yv35-rf,
-          yv35-ji,
-          yv4-sd,
-          yv4-ff,
-          yv4-wf,
+          smc-mn,
         ]
         # Need to set this to false otherwise it will cancel all platform builds if one fails.
       fail-fast: false
@@ -56,7 +42,9 @@ jobs:
         libsdl2-dev \
   
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.10'
 
     # Exactly what it says on the tin.    
     - name: Install requirements
@@ -75,7 +63,7 @@ jobs:
       with:
         path: |
           ./modules
-          ./zephyr
+          ./zephyr_nuvoton
         key: west-yml-${{ hashFiles('OpenBIC/west.yml') }}
  
     - name: Cache SDK Toolchain
@@ -100,20 +88,15 @@ jobs:
 
     - name: Update West Project
       run: |
-        cd OpenBIC 
+        cd OpenBIC
         west update
  
-    - name: Apply Kernel Patches
-      run: |
-        ${{ github.event.repository.name }}/scripts/build/apply_patches.py --source="${{ github.event.repository.name }}/fix_patch/" --destination="zephyr"
- 
     - name: Build Platform
       id: build
       continue-on-error: true
       run: |
-        cd ${{ github.event.repository.name }} 
-        touch meta-facebook/${{ matrix.platform }}/CMakeLists.txt
-        west build -p auto -b ast1030_evb meta-facebook/${{ matrix.platform }}/
+        echo $(ls -l)
+        west -z zephyr_nuvoton build -p auto -b npcm400f_evb OpenBIC/meta-nuvoton/${{ matrix.platform }}/
 
     - name: Get Build Status
       env:
@@ -171,9 +154,11 @@ jobs:
       name: Checkout Repo
       if: env.contains_c_source == 'true'
         
-    - uses: actions/setup-python@v2
-      name: Setup Python
+    - name: Setup Python
       if: env.contains_c_source == 'true'
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.10'
 
     - name: Install CPPCheck
       if: env.contains_c_source == 'true'
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 4643627da4..efb5bec342 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -28,6 +28,6 @@ jobs:
     needs: check_date
     if: ${{ needs.check_date.outputs.should_run != 'false' }}
     name: kickoff nightly
-    uses: facebook/OpenBIC/.github/workflows/build_and_lint_pr.yml@main
+    uses: Nuvoton-Israel/OpenBIC/.github/workflows/build_and_lint_pr.yml@main
     with:
       nightly: true # We don't want to run linters on nightly because it creates a lot of pointless noise.
diff --git a/common/dev/include/pmbus.h b/common/dev/include/pmbus.h
index c25e732e9d..d42011cfff 100644
--- a/common/dev/include/pmbus.h
+++ b/common/dev/include/pmbus.h
@@ -17,7 +17,7 @@
 #ifndef PMBUS_H
 #define PMBUS_H
 
-#include "../../zephyr/include/sys/util.h"
+#include <sys/util.h>
 
 enum PMBUS_PAGE_NUM {
 	PMBUS_PAGE_0,
diff --git a/west.yml b/west.yml
index 157fb8d900..2011916346 100644
--- a/west.yml
+++ b/west.yml
@@ -1,27 +1,20 @@
 manifest:
   remotes:
-    - name: aspeed
-      url-base: https://github.com/AspeedTech-BMC
     - name: nuvoton
       url-base: https://github.com/Nuvoton-Israel
 
   # Please add items below based on alphabetical order.
   # These dependencies may need updating if new features are added to the firmware.
   projects:
-    - name: zephyr
-      remote: aspeed
-      path: zephyr
-      revision: d014527731033db477f806f5bff2e1ca5d4b2ba7
-      import: 
-        name-allowlist:
-          - cmsis
-          - mcuboot
-
     - name: zephyr_nuvoton
       remote: nuvoton
       repo-path: zephyr
       path: zephyr_nuvoton
-      revision: openbic-v2.6.0.0
+      revision: ec652b51c96dc444139063c0857984d95da08be7
+      import:
+        name-allowlist:
+          - cmsis
+          - mcuboot
 
   self:
     path: openbic