diff --git a/.github/workflows/reusable-uki-test.yaml b/.github/workflows/reusable-uki-test.yaml
index 473705709..b26bce769 100644
--- a/.github/workflows/reusable-uki-test.yaml
+++ b/.github/workflows/reusable-uki-test.yaml
@@ -27,7 +27,7 @@ jobs:
     env:
       FLAVOR: ${{ inputs.flavor }}
       FLAVOR_RELEASE: ${{ inputs.flavor_release }}
-      TEMP_IMAGE: ttl.sh/${{ inputs.flavor }}-${{ inputs.flavor_release}}-${{ github.head_ref || github.ref }}:24h
+      TEMP_IMAGE: ttl.sh/${{ inputs.flavor }}-${{ inputs.flavor_release}}-${{ github.sha }}:6h
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
       - name: Install Go
diff --git a/Earthfile b/Earthfile
index 5bf2598dd..a50cd8f8a 100644
--- a/Earthfile
+++ b/Earthfile
@@ -8,7 +8,7 @@ ARG TRIVY_VERSION=0.51.4
 # renovate: datasource=docker depName=quay.io/kairos/framework versioning=semver
 ARG KAIROS_FRAMEWORK_VERSION=v2.8.5
 # renovate: datasource=docker depName=quay.io/kairos/osbuilder-tools versioning=semver
-ARG OSBUILDER_VERSION=v0.201.0
+ARG OSBUILDER_VERSION=v0.300.0
 # renovate: datasource=docker depName=golang versioning=semver
 ARG GO_VERSION=1.20
 # renovate: datasource=docker depName=hadolint/hadolint
@@ -345,7 +345,7 @@ uki-iso:
     ELSE IF [ "$ENKI_OUTPUT_TYPE" == "container" ]
         SAVE ARTIFACT /build/*.tar AS LOCAL build/
     ELSE IF [ "$ENKI_OUTPUT_TYPE" == "uki" ]
-        SAVE ARTIFACT /build/*.efi AS LOCAL build/
+        SAVE ARTIFACT /build/* AS LOCAL build/
     END
 
 # WARNING the following targets are just for development purposes, use them at your own risk
@@ -619,7 +619,7 @@ arm-image:
   COPY --platform=linux/arm64 +image-rootfs/rootfs /build/image
   # With docker is required for loop devices
   WITH DOCKER --allow-privileged
-    RUN /build-arm-image.sh --use-lvm --model $MODEL --directory "/build/image" /build/$IMAGE_NAME
+    RUN /build-arm-image.sh --model $MODEL --directory "/build/image" /build/$IMAGE_NAME
   END
   IF [ "$COMPRESS_IMG" = "true" ]
     IF [ "$IMG_COMPRESSION" = "zstd" ]