diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 1d75575..52c411a 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -44,7 +44,7 @@ jobs:
   build:
     name: Build ${{ matrix.arch }} plugin
     needs: init
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runs-on }}
     permissions:
       contents: read
       packages: write
@@ -52,6 +52,10 @@ jobs:
     strategy:
       matrix:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
+        include:
+          - runs-on: ubuntu-24.04
+          - arch: aarch64
+            runs-on: ubuntu-24.04-arm
     steps:
     - name: Checkout the repository
       uses: actions/checkout@v6.0.0
@@ -71,6 +75,7 @@ jobs:
     - name: Build plugin
       uses: home-assistant/builder@2025.09.0
       with:
+        image: ${{ matrix.arch }}
         args: |
           $BUILD_ARGS \
           --${{ matrix.arch }} \
diff --git a/build.yaml b/build.yaml
index 83a9f89..3c18c4f 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,10 +1,7 @@
 image: ghcr.io/home-assistant/{arch}-hassio-cli
 build_from:
   aarch64: ghcr.io/home-assistant/aarch64-base:3.22
-  armhf: ghcr.io/home-assistant/armhf-base:3.22
-  armv7: ghcr.io/home-assistant/armv7-base:3.22
   amd64: ghcr.io/home-assistant/amd64-base:3.22
-  i386: ghcr.io/home-assistant/i386-base:3.22
 cosign:
   base_identity: https://github.com/home-assistant/docker-base/.*
   identity: https://github.com/home-assistant/plugin-cli/.*