diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index 4361e7c..0a6ed91 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -5,16 +5,25 @@ matrix:
   include:
     - PLATFORM: rhel-9
       PLATFORM_ID: el9
+      ARCH: arm64
     - PLATFORM: centos-8
       PLATFORM_ID: el8
+      ARCH: arm64
     - PLATFORM: ubuntu-2204
       PLATFORM_ID: 2204
+      ARCH: arm64
     - PLATFORM: ubuntu-2404
       PLATFORM_ID: 2404
+      ARCH: arm64
     - PLATFORM: opensuse-155
       PLATFORM_ID: suse155
+      ARCH: arm64
     - PLATFORM: alpine-320
       PLATFORM_ID: alpine320
+      ARCH: arm64
+    - PLATFORM: alpine-320
+      PLATFORM_ID: alpine320
+      ARCH: amd64
 
 steps:
   # Ensures that we're always using the latest available upstream build chain
@@ -55,12 +64,11 @@ steps:
         from_secret: b2_application_key_id
       AWS_SECRET_ACCESS_KEY:
         from_secret: b2_application_key
-      # AWS_REGION: s3.eu-central-003
       AWS_ENDPOINT_URL: https://s3.eu-central-003.backblazeb2.com
     image: alpine:3.20
     commands:
       - apk add -q --no-cache aws-cli
-      - aws s3 ls s3://devxy-r-builds/${PLATFORM_ID}/ | tail -1 | awk '{print $NF}' | cut -c 3-7 > r_build_latest.txt
+      - aws s3 ls s3://devxy-r-builds/${PLATFORM_ID}/${ARCH}/ | tail -1 | awk '{print $NF}' | cut -c 3-7 > r_build_latest.txt
       - cat r_build_latest.txt
     backend_options:
       kubernetes:
@@ -90,7 +98,7 @@ steps:
             memory: 1000Mi
             cpu: 4000m
         nodeSelector:
-          kubernetes.io/arch: "arm64"
+          kubernetes.io/arch: "${ARCH}"
           topology.kubernetes.io/region: fsn1
         tolerations:
           - key: "CI"
@@ -135,7 +143,7 @@ services:
       DOCKER_TLS_CERTDIR: ""
     image: docker:26-dind
     commands:
-      - mkdir -p /tmp/${PLATFORM}
+      - mkdir -p /tmp/${PLATFORM}/${ARCH}
       - dockerd --tls=false --host=tcp://0.0.0.0:2375
     privileged: true
     ports:
@@ -145,5 +153,5 @@ services:
     backend_options:
       kubernetes:
         nodeSelector:
-          kubernetes.io/arch: "arm64"
+          kubernetes.io/arch: "${ARCH}"
           topology.kubernetes.io/region: fsn1