diff --git a/.github/workflows/bake-image.yml b/.github/workflows/bake-image.yml
index 9e73a99..3871a62 100644
--- a/.github/workflows/bake-image.yml
+++ b/.github/workflows/bake-image.yml
@@ -3,12 +3,12 @@ name: Bake Image
 on:
   workflow_dispatch:
   push:
-    branches:
-      - main
-      - ci
+    # branches:
+    #   - main
+    #   - ci
 
 env:
-  PI_BASE_IMAGE: "https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz"
+   RUGPI_VERSION: "feat-layers"
 
 jobs:  
   bake-image:
@@ -21,15 +21,12 @@ jobs:
 
       - name: Install QEMU
         run: docker run --privileged --rm tonistiigi/binfmt --install arm64
-
-      - name: Extract Image
-        run: ./run-bakery extract ${{ env.PI_BASE_IMAGE }} build/base.tar
       
-      - name: Customize System
-        run: ./run-bakery customize build/base.tar build/customized.tar
+      - name: Bake Image (Pi4)
+        run: ./run-bakery bake image pi4 build/pi4.img
       
-      - name: Bake Image
-        run: ./run-bakery bake build/customized.tar build/customized.img
+      - name: Bake Image (Tryboot)
+        run: ./run-bakery bake image tryboot build/tryboot.img
 
       - name: Upload Image
         uses: actions/upload-artifact@v3