diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index def710f..673edbe 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -6,36 +6,46 @@ matrix:
     - PLATFORM: rhel-9
       PLATFORM_ID: el9
       ARCH: arm64
+      ARCH_ID: aarch64
     - PLATFORM: rhel-9
       PLATFORM_ID: el9
       ARCH: amd64
+      ARCH_ID: x86_64
     - PLATFORM: centos-8
       PLATFORM_ID: el8
       ARCH: arm64
+      ARCH_ID: aarch64
     - PLATFORM: centos-8
       PLATFORM_ID: el8
       ARCH: amd64
+      ARCH_ID: x86_64
     - PLATFORM: ubuntu-2204
       PLATFORM_ID: 2204
       ARCH: arm64
+      ARCH_ID: arm64
     - PLATFORM: ubuntu-2204
       PLATFORM_ID: 2204
       ARCH: amd64
+      ARCH_ID: amd64
     - PLATFORM: ubuntu-2404
       PLATFORM_ID: 2404
       ARCH: arm64
+      ARCH_ID: arm64
     - PLATFORM: ubuntu-2404
       PLATFORM_ID: 2404
       ARCH: amd64
-    - PLATFORM: opensuse-155
-      PLATFORM_ID: suse155
-      ARCH: arm64
+      ARCH_ID: amd64
+    # - PLATFORM: opensuse-155
+    #   PLATFORM_ID: suse155
+    #   ARCH: arm64
     - PLATFORM: alpine-320
       PLATFORM_ID: alpine320
       ARCH: arm64
+      ARCH_ID: aarch64
     - PLATFORM: alpine-320
       PLATFORM_ID: alpine320
       ARCH: amd64
+      ARCH_ID: x86_64
 
 steps:
   # Ensures that we're always using the latest available upstream build chain
@@ -80,7 +90,7 @@ steps:
     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}/ | grep ${ARCH_ID} | tail -1 | awk '{print $NF}' | cut -c 3-7 > r_build_latest.txt
       - cat r_build_latest.txt
     backend_options:
       kubernetes: