diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index eb7b5a0..617b521 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ contains(fromJson('["armhf", "armv7", "aarch64"]'), matrix.arch) && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
     name: Build ${{ matrix.arch }} snmpd add-on
     strategy:
       matrix:
@@ -42,8 +42,9 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build snmpd add-on
-        uses: home-assistant/builder@2024.08.2
+        uses: home-assistant/builder@2025.02.0
         with:
+          image: ${{ contains(fromJson('["armhf", "armv7", "aarch64"]'), matrix.arch) && 'aarch64' || 'amd64' }}
           args: |
             ${{ env.TEST_FLAG }} \
             ${{ env.VERSION_FLAG }} \