diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index f6c73c4..a798a5a 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -8,77 +8,77 @@ depends_on:
 
 matrix:
   include:
-    # - PLATFORM: redhat-9
-    #   BLOCK: 7650:length(pkgs)
-    #   ARCH: arm64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   INSTANCE_TYPE: cax41
-    #   STRATEGY: multisession
-    # - PLATFORM: redhat-8
-    #   BLOCK: 6815:length(pkgs)
-    #   ARCH: arm64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   INSTANCE_TYPE: cax41
-    #   STRATEGY: multisession
-    # - PLATFORM: ubuntu-2404
-    #   BLOCK: 9571:length(pkgs)
-    #   ARCH: arm64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   INSTANCE_TYPE: cax41
-    #   STRATEGY: multisession
-    # - PLATFORM: ubuntu-2204
-    #   BLOCK: 9816:length(pkgs)
-    #   ARCH: arm64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   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: 8580:length(pkgs)
-    #   ARCH: amd64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   INSTANCE_TYPE: cpx51
-    #   STRATEGY: multisession
+    - PLATFORM: redhat-9
+      BLOCK: 8877:length(pkgs)
+      ARCH: arm64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cax41
+      STRATEGY: multisession
     - PLATFORM: redhat-8
-      BLOCK: 8473:length(pkgs)
+      BLOCK: 8404:length(pkgs)
+      ARCH: arm64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cax41
+      STRATEGY: multisession
+    - PLATFORM: ubuntu-2404
+      BLOCK: 10665:length(pkgs)
+      ARCH: arm64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cax41
+      STRATEGY: multisession
+    - PLATFORM: ubuntu-2204
+      BLOCK: 11044:length(pkgs)
+      ARCH: arm64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cax41
+      STRATEGY: multisession
+    - PLATFORM: alpine-320
+      BLOCK: 8666:length(pkgs)
+      ARCH: arm64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cax41
+      STRATEGY: multisession
+  #   ### AMD
+    - PLATFORM: redhat-9
+      BLOCK: 9796:length(pkgs)
+      ARCH: amd64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cpx51
+      STRATEGY: multisession
+    - PLATFORM: redhat-8
+      BLOCK: 9611:length(pkgs)
+      ARCH: amd64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cpx51
+      STRATEGY: multisession
+    - PLATFORM: ubuntu-2404
+      BLOCK: 12753:length(pkgs)
+      ARCH: amd64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cpx51
+      STRATEGY: multisession
+    - PLATFORM: ubuntu-2204
+      BLOCK: 12885:length(pkgs)
+      ARCH: amd64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cpx51
+      STRATEGY: multisession
+    - PLATFORM: alpine-320
+      BLOCK: 8854: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]
diff --git a/.woodpecker/warm_up_build.yaml b/.woodpecker/warm_up_build.yaml
index cd4e899..b7b7950 100644
--- a/.woodpecker/warm_up_build.yaml
+++ b/.woodpecker/warm_up_build.yaml
@@ -5,77 +5,77 @@ skip_clone: true
 
 matrix:
   include:
-    # - PLATFORM: redhat-9
-    #   BLOCK: 7650:length(pkgs)
-    #   ARCH: arm64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   INSTANCE_TYPE: cax41
-    #   STRATEGY: multisession
-    # - PLATFORM: redhat-8
-    #   BLOCK: 6815:length(pkgs)
-    #   ARCH: arm64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   INSTANCE_TYPE: cax41
-    #   STRATEGY: multisession
-    # - PLATFORM: ubuntu-2404
-    #   BLOCK: 9571:length(pkgs)
-    #   ARCH: arm64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   INSTANCE_TYPE: cax41
-    #   STRATEGY: multisession
-    # - PLATFORM: ubuntu-2204
-    #   BLOCK: 9816:length(pkgs)
-    #   ARCH: arm64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   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: 8580:length(pkgs)
-    #   ARCH: amd64
-    #   NCPUS: 2
-    #   MEMORY: 29Gi
-    #   INSTANCE_TYPE: cpx51
-    #   STRATEGY: multisession
+    - PLATFORM: redhat-9
+      BLOCK: 8877:length(pkgs)
+      ARCH: arm64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cax41
+      STRATEGY: multisession
     - PLATFORM: redhat-8
-      BLOCK: 8473:length(pkgs)
+      BLOCK: 8404:length(pkgs)
+      ARCH: arm64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cax41
+      STRATEGY: multisession
+    - PLATFORM: ubuntu-2404
+      BLOCK: 10665:length(pkgs)
+      ARCH: arm64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cax41
+      STRATEGY: multisession
+    - PLATFORM: ubuntu-2204
+      BLOCK: 11044:length(pkgs)
+      ARCH: arm64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cax41
+      STRATEGY: multisession
+    - PLATFORM: alpine-320
+      BLOCK: 8666:length(pkgs)
+      ARCH: arm64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cax41
+      STRATEGY: multisession
+  #   ### AMD
+    - PLATFORM: redhat-9
+      BLOCK: 9796:length(pkgs)
+      ARCH: amd64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cpx51
+      STRATEGY: multisession
+    - PLATFORM: redhat-8
+      BLOCK: 9611:length(pkgs)
+      ARCH: amd64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cpx51
+      STRATEGY: multisession
+    - PLATFORM: ubuntu-2404
+      BLOCK: 12753:length(pkgs)
+      ARCH: amd64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cpx51
+      STRATEGY: multisession
+    - PLATFORM: ubuntu-2204
+      BLOCK: 12885:length(pkgs)
+      ARCH: amd64
+      NCPUS: 2
+      MEMORY: 29Gi
+      INSTANCE_TYPE: cpx51
+      STRATEGY: multisession
+    - PLATFORM: alpine-320
+      BLOCK: 8854: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: 'Warming up'
     image: busybox:latest
diff --git a/R/archive_packages.R b/R/archive_packages.R
index 464d878..bba5837 100644
--- a/R/archive_packages.R
+++ b/R/archive_packages.R
@@ -65,7 +65,7 @@ archive_package <- function(
       # get most recent version from CRAN
       last_version <- available.packages("https://cloud.r-project.org/src/contrib")[.x, "Version"]
       # check if last version is available in repo
-      if (any(grepl(last_version, all_versions))) {
+      if (any(grepl(sprintf("^%s_%s.tar.gz", package_name, last_version), all_versions))) {
         index <- which(grepl(sprintf("_%s.tar.gz", last_version), all_versions, fixed = TRUE))
         old_versions <- all_versions[-index]
       } else {