diff --git a/.github/workflows/release-arm.yaml b/.github/workflows/release-arm.yaml
index ea0a46329..f562451f8 100644
--- a/.github/workflows/release-arm.yaml
+++ b/.github/workflows/release-arm.yaml
@@ -123,8 +123,8 @@ jobs:
         run: |
           export TAG=${GITHUB_REF##*/}
 
-          # TODO: Build all arm generic too!!
-          ./earthly.sh +all-arm -VARIANT=kairos -PROVIDER_KAIROS=true -K3S_VERSION=${{ matrix.k3s_version }} -FLAVOR=${{ matrix.flavor }}
+          # TODO: Build all arm generic too!! (and other models?)
+          earthly +all-arm -VARIANT=standard -MODEL=rpi64 -PROVIDER_KAIROS=true -K3S_VERSION=${{ matrix.k3s_version }} -FLAVOR=${{ matrix.flavor }}
       - name: Selfhosted Build  🔧
         if: ${{ matrix.worker == 'self-hosted' }}
         env:
diff --git a/Earthfile b/Earthfile
index 0f1d10fc3..07bdc7c80 100644
--- a/Earthfile
+++ b/Earthfile
@@ -26,7 +26,7 @@ END
 ARG COSIGN_EXPERIMENTAL=0
 ARG CGO_ENABLED=0
 # renovate: datasource=docker depName=quay.io/kairos/osbuilder-tools versioning=semver-coerced
-ARG OSBUILDER_VERSION=v0.8.0
+ARG OSBUILDER_VERSION=v0.7.11
 ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION
 ARG GOLINT_VERSION=1.52.2
 # renovate: datasource=docker depName=golang
@@ -355,6 +355,7 @@ base-image:
     ARG PROVIDER_KAIROS
     ARG PROVIDER_KAIROS_BRANCH
     ARG K3S_VERSION
+    # TODO: Use VARIANT=standard instead?
     IF [[ "$PROVIDER_KAIROS" != "" ]]
         DO +PROVIDER_INSTALL -PROVIDER_KAIROS_BRANCH=${PROVIDER_KAIROS_BRANCH}
 
@@ -626,7 +627,7 @@ arm-image:
   ARG COMPRESS_IMG=true
   ARG IMG_COMPRESSION=xz
   FROM $OSBUILDER_IMAGE
-  ARG MODEL=rpi64
+  ARG MODEL
   COPY +version/VERSION ./
   RUN echo "version ${VERSION}"
   ARG VERSION=$(cat VERSION)