diff --git a/.crow/build-all-versions-install-deps-amd64.yaml b/.crow/build-all-versions-install-deps-amd64.yaml
index a07ea12..c41789f 100644
--- a/.crow/build-all-versions-install-deps-amd64.yaml
+++ b/.crow/build-all-versions-install-deps-amd64.yaml
@@ -35,7 +35,7 @@ steps:
       - git clone -q https://pat-s:$$REPO_RO_TOKEN@git.devxy.io/devxy/build-cran-binaries.git .
       - git clone -q https://codefloe.com/rpkgs/bincraft.git /tmp/bincraft
       - R -q -e 'pak::sysreqs_db_update(); pak::local_install("/tmp/bincraft"); pak::pak(c("RPostgres", "s3fs", "data.table", "future")); packageVersion("bincraft")'
-      - R -q -e "source('local/packages-to-build.R'); saveRDS(pkgs, '/mnt/cache/packages/pkgs_to_build.rds'); sprintf('Precomputed %s packages to build', length(pkgs))"
+      - R -q -e "source('local/packages-to-build.R'); saveRDS(pkgs, '/mnt/cache/packages/pkgs_to_build.rds'); sprintf('Precomputed %s package versions to build', nrow(pkgs))"
     backend_options:
       docker:
         resources:
diff --git a/.crow/build-all-versions-install-deps-arm64.yaml b/.crow/build-all-versions-install-deps-arm64.yaml
index 4639249..dbd1df3 100644
--- a/.crow/build-all-versions-install-deps-arm64.yaml
+++ b/.crow/build-all-versions-install-deps-arm64.yaml
@@ -34,7 +34,7 @@ steps:
       - git clone -q https://pat-s:$$REPO_RO_TOKEN@git.devxy.io/devxy/build-cran-binaries.git .
       - git clone -q https://codefloe.com/rpkgs/bincraft.git /tmp/bincraft
       - R -q -e 'pak::sysreqs_db_update(); pak::local_install("/tmp/bincraft"); pak::pak(c("RPostgres", "s3fs", "data.table", "future")); packageVersion("bincraft")'
-      - R -q -e "source('local/packages-to-build.R'); saveRDS(pkgs, '/mnt/cache/packages/pkgs_to_build.rds'); sprintf('Precomputed %s packages to build', length(pkgs))"
+      - R -q -e "source('local/packages-to-build.R'); saveRDS(pkgs, '/mnt/cache/packages/pkgs_to_build.rds'); sprintf('Precomputed %s package versions to build', nrow(pkgs))"
     backend_options:
       docker:
         resources:
diff --git a/local/packages-to-build.R b/local/packages-to-build.R
index 4e6d754..6263e44 100644
--- a/local/packages-to-build.R
+++ b/local/packages-to-build.R
@@ -18,6 +18,8 @@ suppressPackageStartupMessages(library(data.table))
 arch = Sys.getenv("ARCH")
 # target: alpine-322, ubuntu-2404, redhat-9, etc.
 platform = paste(Sys.getenv("OS"), gsub("[.]", "", Sys.getenv("OS_VERSION")), sep = "-")
+# Use bincraft's codename detection for S3 paths (e.g. "rhel10" not "redhat10")
+codename = bincraft::set_codename()
 
 con <- DBI::dbConnect(
   RPostgres::Postgres(),
@@ -77,7 +79,7 @@ s3fs::s3_file_system(
   refresh = TRUE
 )
 s3_pkgs = s3fs::s3_dir_ls(
-  sprintf("devxy-rpkgs-binaries/%s/%s/latest/src/contrib", arch, sub("-", "", platform)),
+  sprintf("devxy-rpkgs-binaries/%s/%s/latest/src/contrib", arch, codename),
   recurse = TRUE
 )