diff --git a/.github/workflows/template_b2g_build.yml b/.github/workflows/template_b2g_build.yml
index bf621d1..15e42d7 100644
--- a/.github/workflows/template_b2g_build.yml
+++ b/.github/workflows/template_b2g_build.yml
@@ -109,18 +109,23 @@ jobs:
          cd ${work}/B2G/gonk-misc
          sudo rm -r api-daemon
          git clone https://github.com/b2g-gsi/api-daemon -b without-api-daemon
+         #TODO
+         cd ~
+         git clone https://github.com/b2g-gsi/platform_build -b gsi_q --depth=1
+         rm ${work}/B2G/build/make/target/product/aosp_arm64.mk
+         cp ~/platform_build/target/product/aosp_arm64.mk ${work}/B2G/build/make/target/product/
 
     - name: Check The Previous “error.log”
       run: |
-        if [ -d "${work}/out/error.log" ];then
+        if [ -d "${work}/B2G/out/error.log" ];then
           ls ${work}/out
         fi
-        if [ -d "${work}/out/error.log" ];then
-          ls -al ${work}/out/error*
+        if [ -d "${work}/B2G/out/error.log" ];then
+          ls -al ${work}/B2G/out/error*
           echo "old error.log:"
-          cat ${work}/out/error.log
-          sudo rm ${work}/out/error.log
-          touch ${work}/out/error.log
+          cat ${work}/B2G/out/error.log
+          sudo rm ${work}/B2G/out/error.log
+          touch ${work}/B2G/out/error.log
         fi
         
     - name: Build Source Without Gecko
@@ -141,13 +146,14 @@ jobs:
         
         #### build          
         ./b2g/build/build_with_gecko.sh
-        
+
+
     - name: Check Current ”error.log“ Status
       id: check
       run: |
-        if [ -s ${work}/out/error.log ]; then
+        if [ -s ${work}/B2G/out/error.log ]; then
           echo Error!
-          cat ${work}/out/error.log
+          cat ${work}/B2G/out/error.log
           ./init/all_unmount_darwin.sh
           exit 2
         else
@@ -329,6 +335,9 @@ jobs:
         export GONK_DIR=~/.mozbuild/api-sysroot
         export GONK_PRODUCT=${device_name}
         cd ~/api-daemon
+        ### temp
+        mkdir -p ./target/aarch64-linux-android/release/symbols
+        ###
         ./update-prebuilts.sh
         
     - name: zip Artifact
diff --git a/.github/workflows/template_b2g_config.yml b/.github/workflows/template_b2g_config.yml
index 6de35ce..d2cb8c0 100644
--- a/.github/workflows/template_b2g_config.yml
+++ b/.github/workflows/template_b2g_config.yml
@@ -19,7 +19,7 @@ env:
   device_name: phhgsi_arm64_ab
   repo_dispatches: "https://api.github.com/repos/b2g-gsi/build-actions/dispatches"
   b2g_source: "https://github.com/b2g-gsi/B2G"
-  b2g_branch: "b2g-gsi"
+  b2g_branch: "ittat-patch-gsi"
   build_device_tag: gsi_arm64_ab
   device_arch: aarch64-linux-android
 #onyx
diff --git a/b2g/build/build_with_gecko.sh b/b2g/build/build_with_gecko.sh
index 58fb93e..b8a2b6f 100755
--- a/b2g/build/build_with_gecko.sh
+++ b/b2g/build/build_with_gecko.sh
@@ -18,6 +18,7 @@ set -e
         export USE_PREBUILT_B2G=1
         #export OUT_DIR_COMMON_BASE=${out_work}
         export PREFERRED_B2G="${work}/pre-gecko/${gecko_version}"
-        export SKIP_ABI_CHECKS=true 
-        gtimeout 245m  ./build-gsi.sh ${build_device_tag} systemimage
-        ./build-gsi.sh ${build_device_tag} vndk-test-sepolicy
+        
+        export SKIP_ABI_CHECKS=true
+        
+        gtimeout 245m  ./build.sh -j16 systemimage
diff --git a/b2g/build/build_without_gecko.sh b/b2g/build/build_without_gecko.sh
index 9a4136f..7f8a382 100755
--- a/b2g/build/build_without_gecko.sh
+++ b/b2g/build/build_without_gecko.sh
@@ -12,7 +12,8 @@ set -e
         #export OUT_DIR_COMMON_BASE=${out_work}
         export PREFERRED_B2G=${work}/b2g-dummy.tar.bz2
         export USE_PREBUILT_B2G=1
-        #gtimeout 245m ./build.sh -j16 systemimage
         export SKIP_ABI_CHECKS=true
-        gtimeout 245m  ./build-gsi.sh ${build_device_tag} systemimage
+        gtimeout 245m ./build.sh -j16 systemimage
+        #export SKIP_ABI_CHECKS=true
+        #gtimeout 245m  ./build-gsi.sh ${build_device_tag} systemimage
         df -h
diff --git a/b2g/build/create-b2g-sysroot.sh b/b2g/build/create-b2g-sysroot.sh
index ff411d6..7b0b966 100644
--- a/b2g/build/create-b2g-sysroot.sh
+++ b/b2g/build/create-b2g-sysroot.sh
@@ -89,6 +89,7 @@ out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.hardware.
 out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.hardware.wifi.supplicant@1.1.so
 out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.hardware.wifi.supplicant@1.2.so
 out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/android.system.wifi.keystore@1.0.so
+out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/binder_b2g_stub.so
 out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/binder_b2g_connectivity_interface-cpp.so
 out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/binder_b2g_system_interface-cpp.so
 out/target/product/${GONK_PRODUCT_NAME}/system/lib${BINSUFFIX}/binder_b2g_telephony_interface-cpp.so
@@ -145,6 +146,7 @@ frameworks/native/libs/nativebase/include
 frameworks/native/libs/nativewindow/include
 frameworks/native/libs/ui/include
 frameworks/native/opengl/include
+gonk-misc/gonk-binder/binder_b2g_stub/include/
 hardware/interfaces/graphics/composer/2.1/utils/command-buffer/include
 hardware/interfaces/graphics/composer/2.2/utils/command-buffer/include
 hardware/interfaces/graphics/composer/2.3/utils/command-buffer/include
diff --git a/b2g/source/repo_source.sh b/b2g/source/repo_source.sh
index c0f6a89..109b459 100755
--- a/b2g/source/repo_source.sh
+++ b/b2g/source/repo_source.sh
@@ -6,5 +6,5 @@ set -e
         cd ./B2G
         echo Download ...
         #TODO
-        GITREPO=https://github.com/b2g-gsi/manifests BRANCH=full-gsi  REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh b2g_gsi
+        GITREPO=https://github.com/b2g-gsi/manifests BRANCH=gsi_q  REPO_INIT_FLAGS="--depth=1" REPO_SYNC_FLAGS=" -j128 --force-sync --current-branch --no-tags --no-clone-bundle --optimized-fetch --prune" ./config.sh aosp_arm64
         df -h