diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml
new file mode 100644
index 0000000..53d0f4d
--- /dev/null
+++ b/.github/workflows/build-image.yaml
@@ -0,0 +1,43 @@
+name: build-image
+run-name: Build the shimboot disk image for all boards
+on: [push]
+
+jobs:
+  main:
+    strategy: 
+      matrix:
+        board: [dedede, octopus]
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: wait for rootfs build to finish
+        uses: lewagon/wait-on-check-action@v1.3.3
+        with:
+          ref: ${{ github.ref }}
+          running-workflow-name: build-rootfs
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 10
+
+      - name: download repo
+        uses: actions/checkout@v4
+
+      - name: download rootfs
+        uses: actions/download-artifact@v4
+        with:
+          name: rootfs_tar
+          path: data/rootfs.tar.gz
+      
+      - name: extract rootfs
+        run: |
+          sudo mkdir -p data/rootfs
+          sudo tar -xvf data/rootfs.tar.gz -C data/rootfs
+      
+      - name: run build
+        run: sudo DEBUG=1 ./build_complete.sh ${{ matrix.board }} compress_img=1 rootfs_dir=./data/rootfs
+
+      - name: upload img
+        uses: actions/upload-artifact@v4
+        with:
+          name: shimboot_${{ matrix.board }}
+          path: data/shimboot_${{ matrix.board }}.zip
+          compression-level: 0
\ No newline at end of file
diff --git a/.github/workflows/build-rootfs.yaml b/.github/workflows/build-rootfs.yaml
index 0667baa..c0a2e38 100644
--- a/.github/workflows/build-rootfs.yaml
+++ b/.github/workflows/build-rootfs.yaml
@@ -19,7 +19,6 @@ jobs:
           sudo apt-get install debootstrap coreutils -y
 
       - name: run build
-        id: run_build
         run: sudo DEBUG=1 ./build_rootfs.sh data/rootfs bookworm hostname=shimboot root_passwd=root username=user user_passwd=user
       
       - name: archive rootfs
@@ -29,4 +28,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: rootfs_tar
-          path: data/rootfs.tar.gz
\ No newline at end of file
+          path: data/rootfs.tar.gz
+          compression-level: 0
\ No newline at end of file