diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index df54b55..2d0712e 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -23,7 +23,6 @@ jobs:
           - ssc335de_lite_uniview-c1l-2wn-g-ru
           - t21_lite_wansview-q5-1080p
           - t31_lite_xiaomi-mjsxj03hl
-          
 
     steps:
       - name: Checkout
@@ -33,6 +32,7 @@ jobs:
         run: |
           echo "8.8.8.8 invisible-mirror.net" | sudo tee -a /etc/hosts
           echo "8.8.8.8 distfiles.dereferenced.org" | sudo tee -a /etc/hosts
+          git clone https://github.com/openipc/firmware --depth 1
 
       - name: Build
         run: |
@@ -40,17 +40,19 @@ jobs:
           export GIT_BRANCH=${GITHUB_REF_NAME}
 
           NAME=${{matrix.platform}}
-          bash builder.sh ${NAME}
+          cp -rf devices/${NAME}/* firmware
+          cd firmware
+          make BOARD=${NAME} all
 
-          NORFW=$(find ${GITHUB_WORKSPACE}/openipc/output/images -name openipc*nor*)
+          NORFW=$(find output/images -name openipc*nor*)
           if [ ! -z ${NORFW} ]; then
-            mv ${NORFW} ${NAME}-nor.tgz
+            mv ${NORFW} ../${NAME}-nor.tgz
             echo NORFW=${GITHUB_WORKSPACE}/${NAME}-nor.tgz >> ${GITHUB_ENV}
           fi
 
-          NANDFW=$(find ${GITHUB_WORKSPACE}/openipc/output/images -name openipc*nand*)
+          NANDFW=$(find output/images -name openipc*nand*)
           if [ ! -z ${NANDFW} ]; then
-            mv ${NANDFW} ${NAME}-nand.tgz
+            mv ${NANDFW} ../${NAME}-nand.tgz
             echo NANDFW=${GITHUB_WORKSPACE}/${NAME}-nand.tgz >> ${GITHUB_ENV}
           fi