diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index 673edbe..5bbab31 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -7,34 +7,42 @@ matrix:
       PLATFORM_ID: el9
       ARCH: arm64
       ARCH_ID: aarch64
+      INSTANCE_TYPE: cax31
     - PLATFORM: rhel-9
       PLATFORM_ID: el9
       ARCH: amd64
       ARCH_ID: x86_64
+      INSTANCE_TYPE: cpx41
     - PLATFORM: centos-8
       PLATFORM_ID: el8
       ARCH: arm64
       ARCH_ID: aarch64
+      INSTANCE_TYPE: cax31
     - PLATFORM: centos-8
       PLATFORM_ID: el8
       ARCH: amd64
       ARCH_ID: x86_64
+      INSTANCE_TYPE: cpx41
     - PLATFORM: ubuntu-2204
       PLATFORM_ID: 2204
       ARCH: arm64
       ARCH_ID: arm64
+      INSTANCE_TYPE: cax31
     - PLATFORM: ubuntu-2204
       PLATFORM_ID: 2204
       ARCH: amd64
       ARCH_ID: amd64
+      INSTANCE_TYPE: cpx41
     - PLATFORM: ubuntu-2404
       PLATFORM_ID: 2404
       ARCH: arm64
       ARCH_ID: arm64
+      INSTANCE_TYPE: cax31
     - PLATFORM: ubuntu-2404
       PLATFORM_ID: 2404
       ARCH: amd64
       ARCH_ID: amd64
+      INSTANCE_TYPE: cpx41
     # - PLATFORM: opensuse-155
     #   PLATFORM_ID: suse155
     #   ARCH: arm64
@@ -42,10 +50,12 @@ matrix:
       PLATFORM_ID: alpine320
       ARCH: arm64
       ARCH_ID: aarch64
+      INSTANCE_TYPE: cax31
     - PLATFORM: alpine-320
       PLATFORM_ID: alpine320
       ARCH: amd64
       ARCH_ID: x86_64
+      INSTANCE_TYPE: cpx41
 
 steps:
   # Ensures that we're always using the latest available upstream build chain
@@ -78,7 +88,8 @@ steps:
             memory: 200Mi
             cpu: 500m
         nodeSelector:
-          topology.kubernetes.io/region: fsn1
+          kubernetes.io/arch: "${ARCH}"
+          node.kubernetes.io/instance-type: "${INSTANCE_TYPE}"
 
   - name: Check if files for R version already exist in s3
     environment:
@@ -95,7 +106,8 @@ steps:
     backend_options:
       kubernetes:
         nodeSelector:
-          topology.kubernetes.io/region: fsn1
+          kubernetes.io/arch: "${ARCH}"
+          node.kubernetes.io/instance-type: "${INSTANCE_TYPE}"
 
   # ref: https://github.com/woodpecker-ci/woodpecker/discussions/2721
   - name: Build
@@ -121,7 +133,7 @@ steps:
             cpu: 4000m
         nodeSelector:
           kubernetes.io/arch: "${ARCH}"
-          topology.kubernetes.io/region: fsn1
+          node.kubernetes.io/instance-type: "${INSTANCE_TYPE}"
         tolerations:
           - key: "CI"
             operator: "Equal"
@@ -156,7 +168,8 @@ steps:
             memory: 1000Mi
             cpu: 1000m
         nodeSelector:
-          topology.kubernetes.io/region: fsn1
+          kubernetes.io/arch: "${ARCH}"
+          node.kubernetes.io/instance-type: "${INSTANCE_TYPE}"
 
 services:
   docker:
@@ -175,4 +188,4 @@ services:
       kubernetes:
         nodeSelector:
           kubernetes.io/arch: "${ARCH}"
-          topology.kubernetes.io/region: fsn1
+          node.kubernetes.io/instance-type: "${INSTANCE_TYPE}"