diff --git a/.github/pipeline-version b/.github/pipeline-version
index 2b17ffd50..2aeaa11ee 100644
--- a/.github/pipeline-version
+++ b/.github/pipeline-version
@@ -1 +1 @@
-1.34.0
+1.35.0
diff --git a/.github/workflows/pb-update-jdk-11-arm-64.yml b/.github/workflows/pb-update-jdk-11-arm-64.yml
index bf0681bfa..24c1b8b49 100644
--- a/.github/workflows/pb-update-jdk-11-arm-64.yml
+++ b/.github/workflows/pb-update-jdk-11-arm-64.yml
@@ -55,11 +55,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -90,6 +87,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: arm
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: jdk
diff --git a/.github/workflows/pb-update-jdk-11.yml b/.github/workflows/pb-update-jdk-11.yml
index 43f8e600b..b946a30b9 100644
--- a/.github/workflows/pb-update-jdk-11.yml
+++ b/.github/workflows/pb-update-jdk-11.yml
@@ -54,11 +54,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -89,6 +86,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: ""
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: jdk
diff --git a/.github/workflows/pb-update-jdk-17-arm-64.yml b/.github/workflows/pb-update-jdk-17-arm-64.yml
index 11f3adb25..575bd2589 100644
--- a/.github/workflows/pb-update-jdk-17-arm-64.yml
+++ b/.github/workflows/pb-update-jdk-17-arm-64.yml
@@ -55,11 +55,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -90,6 +87,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: arm
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: jdk
diff --git a/.github/workflows/pb-update-jdk-17.yml b/.github/workflows/pb-update-jdk-17.yml
index 07c228f51..c2d97a799 100644
--- a/.github/workflows/pb-update-jdk-17.yml
+++ b/.github/workflows/pb-update-jdk-17.yml
@@ -54,11 +54,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -89,6 +86,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: ""
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: jdk
diff --git a/.github/workflows/pb-update-jdk-21-arm-64.yml b/.github/workflows/pb-update-jdk-21-arm-64.yml
index 6d80caa07..4bf1ef824 100644
--- a/.github/workflows/pb-update-jdk-21-arm-64.yml
+++ b/.github/workflows/pb-update-jdk-21-arm-64.yml
@@ -55,11 +55,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -90,6 +87,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: arm
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: jdk
diff --git a/.github/workflows/pb-update-jdk-21.yml b/.github/workflows/pb-update-jdk-21.yml
index 3dd9fef16..d8217652a 100644
--- a/.github/workflows/pb-update-jdk-21.yml
+++ b/.github/workflows/pb-update-jdk-21.yml
@@ -54,11 +54,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -89,6 +86,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: ""
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: jdk
diff --git a/.github/workflows/pb-update-jdk-8-arm-64.yml b/.github/workflows/pb-update-jdk-8-arm-64.yml
index 49344a456..2260bb47c 100644
--- a/.github/workflows/pb-update-jdk-8-arm-64.yml
+++ b/.github/workflows/pb-update-jdk-8-arm-64.yml
@@ -55,11 +55,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -90,6 +87,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: arm
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: update[\d]+
                 ID: jdk
diff --git a/.github/workflows/pb-update-jdk-8.yml b/.github/workflows/pb-update-jdk-8.yml
index 571de7678..fc5697144 100644
--- a/.github/workflows/pb-update-jdk-8.yml
+++ b/.github/workflows/pb-update-jdk-8.yml
@@ -54,11 +54,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -89,6 +86,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: ""
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: update[\d]+
                 ID: jdk
diff --git a/.github/workflows/pb-update-jre-11-arm-64.yml b/.github/workflows/pb-update-jre-11-arm-64.yml
index 1a9328539..5beee184b 100644
--- a/.github/workflows/pb-update-jre-11-arm-64.yml
+++ b/.github/workflows/pb-update-jre-11-arm-64.yml
@@ -55,11 +55,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -90,6 +87,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: arm
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: jre
diff --git a/.github/workflows/pb-update-jre-11.yml b/.github/workflows/pb-update-jre-11.yml
index b2111a5be..823a1c6a3 100644
--- a/.github/workflows/pb-update-jre-11.yml
+++ b/.github/workflows/pb-update-jre-11.yml
@@ -54,11 +54,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -89,6 +86,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: ""
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: jre
diff --git a/.github/workflows/pb-update-jre-17-arm-64.yml b/.github/workflows/pb-update-jre-17-arm-64.yml
index c401c6f53..776390e3d 100644
--- a/.github/workflows/pb-update-jre-17-arm-64.yml
+++ b/.github/workflows/pb-update-jre-17-arm-64.yml
@@ -55,11 +55,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -90,6 +87,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: arm
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: jre
diff --git a/.github/workflows/pb-update-jre-17.yml b/.github/workflows/pb-update-jre-17.yml
index 934650da4..e1ec2da26 100644
--- a/.github/workflows/pb-update-jre-17.yml
+++ b/.github/workflows/pb-update-jre-17.yml
@@ -54,11 +54,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -89,6 +86,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: ""
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: jre
diff --git a/.github/workflows/pb-update-jre-21-arm-64.yml b/.github/workflows/pb-update-jre-21-arm-64.yml
index 8ff124e82..c728c2e87 100644
--- a/.github/workflows/pb-update-jre-21-arm-64.yml
+++ b/.github/workflows/pb-update-jre-21-arm-64.yml
@@ -55,11 +55,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -90,6 +87,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: arm
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: jre
diff --git a/.github/workflows/pb-update-jre-21.yml b/.github/workflows/pb-update-jre-21.yml
index c8bab210d..c8107c16d 100644
--- a/.github/workflows/pb-update-jre-21.yml
+++ b/.github/workflows/pb-update-jre-21.yml
@@ -54,11 +54,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -89,6 +86,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: ""
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: jre
diff --git a/.github/workflows/pb-update-jre-8-arm-64.yml b/.github/workflows/pb-update-jre-8-arm-64.yml
index 653b177c9..122ad35ed 100644
--- a/.github/workflows/pb-update-jre-8-arm-64.yml
+++ b/.github/workflows/pb-update-jre-8-arm-64.yml
@@ -55,11 +55,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -90,6 +87,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: arm
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: update[\d]+
                 ID: jre
diff --git a/.github/workflows/pb-update-jre-8.yml b/.github/workflows/pb-update-jre-8.yml
index 1849ff5f5..472bd58e9 100644
--- a/.github/workflows/pb-update-jre-8.yml
+++ b/.github/workflows/pb-update-jre-8.yml
@@ -54,11 +54,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -89,6 +86,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: ""
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: update[\d]+
                 ID: jre
diff --git a/.github/workflows/pb-update-native-image-11-arm-64.yml b/.github/workflows/pb-update-native-image-11-arm-64.yml
index af8f2d223..d7cd93f5a 100644
--- a/.github/workflows/pb-update-native-image-11-arm-64.yml
+++ b/.github/workflows/pb-update-native-image-11-arm-64.yml
@@ -55,11 +55,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -90,6 +87,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: arm
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: native-image-svm
diff --git a/.github/workflows/pb-update-native-image-11.yml b/.github/workflows/pb-update-native-image-11.yml
index c299cd2ef..17bcb09d2 100644
--- a/.github/workflows/pb-update-native-image-11.yml
+++ b/.github/workflows/pb-update-native-image-11.yml
@@ -54,11 +54,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -89,6 +86,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: ""
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: native-image-svm
diff --git a/.github/workflows/pb-update-native-image-17-arm-64.yml b/.github/workflows/pb-update-native-image-17-arm-64.yml
index 86d950df7..a131db345 100644
--- a/.github/workflows/pb-update-native-image-17-arm-64.yml
+++ b/.github/workflows/pb-update-native-image-17-arm-64.yml
@@ -55,11 +55,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -90,6 +87,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: arm
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: native-image-svm
diff --git a/.github/workflows/pb-update-native-image-17.yml b/.github/workflows/pb-update-native-image-17.yml
index f3ad36823..3b008df31 100644
--- a/.github/workflows/pb-update-native-image-17.yml
+++ b/.github/workflows/pb-update-native-image-17.yml
@@ -54,11 +54,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -89,6 +86,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: ""
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: native-image-svm
diff --git a/.github/workflows/pb-update-native-image-21-arm-64.yml b/.github/workflows/pb-update-native-image-21-arm-64.yml
index 32fb641ec..760cd87dc 100644
--- a/.github/workflows/pb-update-native-image-21-arm-64.yml
+++ b/.github/workflows/pb-update-native-image-21-arm-64.yml
@@ -55,11 +55,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -90,6 +87,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: arm
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: native-image-svm
diff --git a/.github/workflows/pb-update-native-image-21.yml b/.github/workflows/pb-update-native-image-21.yml
index 45543c404..785b33708 100644
--- a/.github/workflows/pb-update-native-image-21.yml
+++ b/.github/workflows/pb-update-native-image-21.yml
@@ -54,11 +54,8 @@ jobs:
 
                 set -euo pipefail
 
-                OLD_VERSION=$(yj -tj < buildpack.toml | jq -r "
-                  .metadata.dependencies[] |
-                  select( .id == env.ID ) |
-                  select( .version | test( env.VERSION_PATTERN ) ) |
-                  .version")
+                OLD_VERSION=$(yj -tj < buildpack.toml | \
+                  jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) )")
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \
@@ -89,6 +86,7 @@ jobs:
                 echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
                 echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
               env:
+                ARCH: ""
                 CPE: ${{ steps.dependency.outputs.cpe }}
                 CPE_PATTERN: ""
                 ID: native-image-svm