diff --git a/.github/workflows/build-template.yml b/.github/workflows/build-template.yml
deleted file mode 100644
index 8bbed27..0000000
--- a/.github/workflows/build-template.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-on:
-  workflow_call:
-    inputs:
-      local_repo:
-        required: false
-        type: string
-      local_ref:
-        required: false
-        type: string
-      branch:
-        required: true
-        type: string
-    secrets:
-      TUXSUITE_TOKEN:
-        required: true
-
-env:
-  MANIFEST_URL: https://github.com/96boards/oe-rpb-manifest.git
-  HOST: debian-bookworm
-  MACHINES: qcom-armv8a qcom-armv7a
-  DISTRO: rpb rpb-wayland
-  IMAGES: rpb-console-image rpb-console-image-test
-  IMAGES_rpb: rpb-desktop-image rpb-desktop-image-test
-  IMAGES_rpb_wayland: rpb-weston-image rpb-weston-image-test
-
-jobs:
-  build:
-    name: ${{github.event_name}} - ${{github.ref}}
-    runs-on: ubuntu-latest
-    steps:
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.x"
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade tuxsuite
-    - name: Setup tux plan
-      run: |
-        cat << EOF > plan.yaml
-        name: CI for ${{github.repository}}
-        description: ${{github.workflow}} - ${{github.ref}}
-        version: 1
-
-        common: &commondata
-          container: $HOST
-          envsetup: setup-environment
-          sources:
-            repo:
-              branch: ${{inputs.branch}}
-              manifest: default.xml
-              url: $MANIFEST_URL
-          local_conf:
-            - INHERIT += 'buildstats buildstats-summary'
-            - INHERIT:remove = 'rm_work'
-            - CONNECTIVITY_CHECK_URIS = "https://www.google.com/"
-          artifacts: []
-
-        rpb: &rpb
-          distro: rpb
-          target: ${IMAGES} ${IMAGES_rpb}
-
-        rpb-wayland: &rpb-wayland
-          distro: rpb-wayland
-          target: ${IMAGES} ${IMAGES_rpb_wayland}
-
-        jobs:
-        EOF
-
-        for distro in ${DISTRO}; do
-        cat << EOF >> plan.yaml
-        - name: ${distro}
-          bakes:
-        EOF
-        for machine in $MACHINES; do
-        cat << EOF >> plan.yaml
-            - { <<: [*commondata, *${distro}], machine: ${machine}, name: ${machine}-${distro} }
-        EOF
-        done
-        done
-        echo "Ready to submit this Tux Plan:"
-        cat plan.yaml
-    - name: Setup local_manifest
-      if: inputs.local_repo && inputs.local_ref
-      run: |
-        cat << EOF > local_manifest.xml
-        <?xml version="1.0" encoding="UTF-8"?>
-        <manifest>
-        <extend-project name="${{ inputs.local_repo }}" revision="${{ inputs.local_ref }}" />
-        </manifest>
-        EOF
-    - name: Run build
-      run: |
-        if [ -f local_manifest.xml ]; then
-            tuxsuite plan plan.yaml -l local_manifest.xml
-        else
-            tuxsuite plan plan.yaml
-        fi
-      env:
-        TUXSUITE_TOKEN: ${{ secrets.TUXSUITE_TOKEN }}
diff --git a/.github/workflows/premerge.yml b/.github/workflows/premerge.yml
index ec47b02..7e33b34 100644
--- a/.github/workflows/premerge.yml
+++ b/.github/workflows/premerge.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   build:
-    uses: ./.github/workflows/build-template.yml
+    uses: 96boards/oe-rpb-manifest/.github/workflows/build-template.yml@master
     with:
       branch: refs/pull/${{github.event.pull_request.number}}/head
       local_repo: ${{github.repository}}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index f99bbc3..e01357a 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -3,11 +3,11 @@ name: Push build
 on:
   push:
     branches:
-      - qcom/master
+      - qcom/scarthgap
 
 jobs:
   build:
-    uses: ./.github/workflows/build-template.yml
+    uses: 96boards/oe-rpb-manifest/.github/workflows/build-template.yml@master
     with:
       branch: ${{github.ref_name}}
     secrets: inherit