diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4184ed55..999fe065 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,21 +11,29 @@ jobs:
     name: build
     runs-on: [self-hosted, forrest, build]
     steps:
-      - run: sudo localectl set-locale en_US.UTF-8
-      - run: sudo apt-get update
-      - run: sudo apt-get --assume-yes dist-upgrade
-      - run: sudo apt-get --assume-yes install build-essential chrpath diffstat gawk git lz4
-      - uses: actions/checkout@v4
+      - name: Set up runner machine
+        run: |
+          sudo localectl set-locale en_US.UTF-8
+          sudo apt-get update
+          sudo apt-get --assume-yes dist-upgrade
+          sudo apt-get --assume-yes install build-essential chrpath diffstat gawk git lz4
+      - name: Check out the repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
-      - run: |
+      - name: Build LXA TAC RAUC bundle
+        run: |
           rm -f conf/local.conf
           source oe-init-build-env
           echo 'INHERIT += "rm_work"' >> conf/local.conf
-          bitbake lxatac-core-bundle-base
+          #bitbake lxatac-core-bundle-base
+          bitbake emmc-boot-image
       - name: Persist the disk image
         env:
           PERSISTENCE_TOKEN: ${{ secrets.PERSISTENCE_TOKEN }}
-        run: echo "$PERSISTENCE_TOKEN" > ~/config/persist
-      - name: Free up unused space in the disk image
-        run: sudo fstrim /
+        run: |
+          if [ -n "$PERSISTENCE_TOKEN" ]
+          then
+            sudo fstrim /
+            echo "$PERSISTENCE_TOKEN" > ~/config/persist
+          fi