diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index 8454c7d..f6c73c4 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -9,66 +9,76 @@ depends_on:
 matrix:
   include:
     # - PLATFORM: redhat-9
-    #   BLOCK: 4810:length(pkgs)
+    #   BLOCK: 7650:length(pkgs)
     #   ARCH: arm64
     #   NCPUS: 2
     #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
+    #   INSTANCE_TYPE: cax41
+    #   STRATEGY: multisession
     # - PLATFORM: redhat-8
-    #   BLOCK: 4503:length(pkgs)
+    #   BLOCK: 6815:length(pkgs)
     #   ARCH: arm64
     #   NCPUS: 2
     #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
+    #   INSTANCE_TYPE: cax41
+    #   STRATEGY: multisession
     # - PLATFORM: ubuntu-2404
-    #   BLOCK: 5301:length(pkgs)
+    #   BLOCK: 9571:length(pkgs)
     #   ARCH: arm64
     #   NCPUS: 2
     #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
+    #   INSTANCE_TYPE: cax41
+    #   STRATEGY: multisession
     # - PLATFORM: ubuntu-2204
-    #   BLOCK: 5849:length(pkgs)
+    #   BLOCK: 9816:length(pkgs)
     #   ARCH: arm64
     #   NCPUS: 2
     #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
-    - PLATFORM: alpine-320
-      BLOCK: 4602:length(pkgs)
-      ARCH: arm64
-      NCPUS: 2
-      MEMORY: 29Gi
-      STRATEGY: multisession
-    # ### AMD
+    #   INSTANCE_TYPE: cax41
+    #   STRATEGY: multisession
+    # - PLATFORM: alpine-320
+    #   BLOCK: 7603:length(pkgs)
+    #   ARCH: arm64
+    #   NCPUS: 2
+    #   MEMORY: 29Gi
+    #   INSTANCE_TYPE: cax41
+    #   STRATEGY: multisession
+    ### AMD
     # - PLATFORM: redhat-9
-    #   BLOCK: 4573:length(pkgs)
+    #   BLOCK: 8580:length(pkgs)
     #   ARCH: amd64
     #   NCPUS: 2
     #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
-    # - PLATFORM: redhat-8
-    #   BLOCK: 3908:length(pkgs)
-    #   ARCH: amd64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
-    # - PLATFORM: ubuntu-2404
-    #   BLOCK: 6256:length(pkgs)
-    #   ARCH: amd64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
-    # - PLATFORM: ubuntu-2204
-    #   BLOCK: 7293:length(pkgs)
-    #   ARCH: amd64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
-    - PLATFORM: alpine-320
-      BLOCK: 4487:length(pkgs)
+    #   INSTANCE_TYPE: cpx51
+    #   STRATEGY: multisession
+    - PLATFORM: redhat-8
+      BLOCK: 8473:length(pkgs)
       ARCH: amd64
       NCPUS: 2
       MEMORY: 29Gi
+      INSTANCE_TYPE: cpx51
       STRATEGY: multisession
+    # - PLATFORM: ubuntu-2404
+    #   BLOCK: 10021:length(pkgs)
+    #   ARCH: amd64
+    #   NCPUS: 2
+    #   MEMORY: 29Gi
+    #   INSTANCE_TYPE: cpx51
+    #   STRATEGY: multisession
+    # - PLATFORM: ubuntu-2204
+    #   BLOCK: 11089:length(pkgs)
+    #   ARCH: amd64
+    #   NCPUS: 2
+    #   MEMORY: 29Gi
+    #   INSTANCE_TYPE: cpx51
+    #   STRATEGY: multisession
+    # - PLATFORM: alpine-320
+    #   BLOCK: 7603:length(pkgs)
+    #   ARCH: amd64
+    #   NCPUS: 2
+    #   MEMORY: 29Gi
+    #   INSTANCE_TYPE: cpx51
+    #   STRATEGY: multisession
 steps:
   - name: 'Build binaries (${PLATFORM}: ${BLOCK})'
     secrets: [red_hat_dev_pw, aws_access_key_id, aws_secret_access_key, pgpass, git_ro_token, GITHUB_PAT]
@@ -160,6 +170,7 @@ steps:
         #     cpu: 2000m
         nodeSelector:
           kubernetes.io/arch: '${ARCH}'
+          node.kubernetes.io/instance-type: '${INSTANCE_TYPE}'
         tolerations:
           - key: 'CI'
             operator: 'Equal'
diff --git a/.woodpecker/warm_up_build.yaml b/.woodpecker/warm_up_build.yaml
index 2359a01..cd4e899 100644
--- a/.woodpecker/warm_up_build.yaml
+++ b/.woodpecker/warm_up_build.yaml
@@ -6,66 +6,76 @@ skip_clone: true
 matrix:
   include:
     # - PLATFORM: redhat-9
-    #   BLOCK: 4810:length(pkgs)
+    #   BLOCK: 7650:length(pkgs)
     #   ARCH: arm64
     #   NCPUS: 2
     #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
+    #   INSTANCE_TYPE: cax41
+    #   STRATEGY: multisession
     # - PLATFORM: redhat-8
-    #   BLOCK: 4503:length(pkgs)
+    #   BLOCK: 6815:length(pkgs)
     #   ARCH: arm64
     #   NCPUS: 2
     #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
+    #   INSTANCE_TYPE: cax41
+    #   STRATEGY: multisession
     # - PLATFORM: ubuntu-2404
-    #   BLOCK: 5301:length(pkgs)
+    #   BLOCK: 9571:length(pkgs)
     #   ARCH: arm64
     #   NCPUS: 2
     #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
+    #   INSTANCE_TYPE: cax41
+    #   STRATEGY: multisession
     # - PLATFORM: ubuntu-2204
-    #   BLOCK: 5849:length(pkgs)
+    #   BLOCK: 9816:length(pkgs)
     #   ARCH: arm64
     #   NCPUS: 2
     #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
-    - PLATFORM: alpine-320
-      BLOCK: 4479:length(pkgs)
-      ARCH: arm64
-      NCPUS: 2
-      MEMORY: 29Gi
-      STRATEGY: multicore
-    # ### AMD
+    #   INSTANCE_TYPE: cax41
+    #   STRATEGY: multisession
+    # - PLATFORM: alpine-320
+    #   BLOCK: 7603:length(pkgs)
+    #   ARCH: arm64
+    #   NCPUS: 2
+    #   MEMORY: 29Gi
+    #   INSTANCE_TYPE: cax41
+    #   STRATEGY: multisession
+    ### AMD
     # - PLATFORM: redhat-9
-    #   BLOCK: 4573:length(pkgs)
+    #   BLOCK: 8580:length(pkgs)
     #   ARCH: amd64
     #   NCPUS: 2
     #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
-    # - PLATFORM: redhat-8
-    #   BLOCK: 3908:length(pkgs)
-    #   ARCH: amd64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
-    # - PLATFORM: ubuntu-2404
-    #   BLOCK: 6256:length(pkgs)
-    #   ARCH: amd64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
-    # - PLATFORM: ubuntu-2204
-    #   BLOCK: 7293:length(pkgs)
-    #   ARCH: amd64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   STRATEGY: future.callr::callr
-    - PLATFORM: alpine-320
-      BLOCK: 4479:length(pkgs)
+    #   INSTANCE_TYPE: cpx51
+    #   STRATEGY: multisession
+    - PLATFORM: redhat-8
+      BLOCK: 8473:length(pkgs)
       ARCH: amd64
       NCPUS: 2
       MEMORY: 29Gi
-      STRATEGY: multicore
+      INSTANCE_TYPE: cpx51
+      STRATEGY: multisession
+    # - PLATFORM: ubuntu-2404
+    #   BLOCK: 10021:length(pkgs)
+    #   ARCH: amd64
+    #   NCPUS: 2
+    #   MEMORY: 29Gi
+    #   INSTANCE_TYPE: cpx51
+    #   STRATEGY: multisession
+    # - PLATFORM: ubuntu-2204
+    #   BLOCK: 11089:length(pkgs)
+    #   ARCH: amd64
+    #   NCPUS: 2
+    #   MEMORY: 29Gi
+    #   INSTANCE_TYPE: cpx51
+    #   STRATEGY: multisession
+    # - PLATFORM: alpine-320
+    #   BLOCK: 7603:length(pkgs)
+    #   ARCH: amd64
+    #   NCPUS: 2
+    #   MEMORY: 29Gi
+    #   INSTANCE_TYPE: cpx51
+    #   STRATEGY: multisession
 steps:
   - name: 'Warming up'
     image: busybox:latest
@@ -101,6 +111,7 @@ steps:
         #     cpu: 2000m
         nodeSelector:
           kubernetes.io/arch: '${ARCH}'
+          node.kubernetes.io/instance-type: '${INSTANCE_TYPE}'
         tolerations:
           - key: 'CI'
             operator: 'Equal'