diff --git a/iso/builder/build-cublas.sh b/iso/builder/build-cublas.sh
index 0716fac..693eb68 100644
--- a/iso/builder/build-cublas.sh
+++ b/iso/builder/build-cublas.sh
@@ -42,14 +42,14 @@ wget -q -O "${PACKAGES_GZ}" "${REPO_BASE}/Packages.gz"
 
 lookup_pkg() {
     pkg="$1"
-    ver="$2"
+    ver="$2"  # if empty, match any version (first found)
     gzip -dc "${PACKAGES_GZ}" | awk -v pkg="$pkg" -v ver="$ver" '
         /^Package: / { cur_pkg=$2; gsub(/\r/, "", cur_pkg) }
         /^Version: / { cur_ver=$2; gsub(/\r/, "", cur_ver) }
         /^Filename: / { cur_file=$2; gsub(/\r/, "", cur_file) }
         /^SHA256: / { cur_sha=$2; gsub(/\r/, "", cur_sha) }
         /^$/ {
-            if (cur_pkg == pkg && cur_ver == ver) {
+            if (cur_pkg == pkg && (ver == "" || cur_ver == ver)) {
                 print cur_file " " cur_sha
                 printed=1
                 exit
@@ -57,7 +57,7 @@ lookup_pkg() {
             cur_pkg=""; cur_ver=""; cur_file=""; cur_sha=""
         }
         END {
-            if (!printed && cur_pkg == pkg && cur_ver == ver) {
+            if (!printed && cur_pkg == pkg && (ver == "" || cur_ver == ver)) {
                 print cur_file " " cur_sha
             }
         }'
@@ -156,7 +156,7 @@ CUBLAS_RT_DEB=$(download_verified_pkg "libcublas-${CUDA_SERIES_DASH}" "${CUBLAS_
 CUBLAS_DEV_DEB=$(download_verified_pkg "libcublas-dev-${CUDA_SERIES_DASH}" "${CUBLAS_VERSION}")
 CUDART_RT_DEB=$(download_verified_pkg "cuda-cudart-${CUDA_SERIES_DASH}" "${CUDA_USERSPACE_VERSION}")
 CUDART_DEV_DEB=$(download_verified_pkg "cuda-cudart-dev-${CUDA_SERIES_DASH}" "${CUDA_USERSPACE_VERSION}")
-CUDA_CRT_DEB=$(download_verified_pkg "cuda-crt-${CUDA_SERIES_DASH}" "${CUDA_USERSPACE_VERSION}")
+CUDA_CRT_DEB=$(download_verified_pkg "cuda-crt-${CUDA_SERIES_DASH}" "")
 
 extract_deb "$CUBLAS_RT_DEB" "${TMP_DIR}/cublas-rt"
 extract_deb "$CUBLAS_DEV_DEB" "${TMP_DIR}/cublas-dev"