func runDownload(args []string, preset crcPreset.Preset, force bool) error {
+	if len(args) > 2 {
+		return fmt.Errorf("too many arguments: expected at most 2 (version, architecture), got %d", len(args))
+	}
 	// Disk space check (simple check for ~10GB free)
 	// This is a basic check, more robust checking would require syscall/windows specific implementations
 	// We skip this for now to avoid adding heavy OS-specific deps, assuming user manages disk space or download fails naturally.

 	resolvedVersion, err := resolveOpenShiftVersion(preset, version)
 	if err != nil {
-		logging.Warnf("Could not resolve version %s: %v. Trying with original version string.", version, err)
+		return fmt.Errorf("failed to resolve version %s: %w", version, err)
 	} else if resolvedVersion != version {
 		logging.Debugf("Resolved version %s to %s", version, resolvedVersion)
 		version = resolvedVersion
 	}

@@
-	if len(bundleFiles) <= keep {
+	if len(bundleFiles) <= keep {
 		logging.Infof("Nothing to prune (found %d bundles, keeping %d)", len(bundleFiles), keep)
 		return nil
 	}
 
-	// Sort by modification time, newest first
-	sort.Slice(bundleFiles, func(i, j int) bool {
-		infoI, errI := bundleFiles[i].Info()
-		infoJ, errJ := bundleFiles[j].Info()
-		if errI != nil || errJ != nil {
-			// If we can't get info, treat as oldest (sort to end for pruning)
-			return errJ != nil && errI == nil
-		}
-		return infoI.ModTime().After(infoJ.ModTime())
-	})
-
-	for i := keep; i < len(bundleFiles); i++ {
-		file := bundleFiles[i]
-		filePath := filepath.Join(cacheDir, file.Name())
-		logging.Infof("Pruning old bundle: %s", file.Name())
-		if err := os.RemoveAll(filePath); err != nil {
-			logging.Errorf("Failed to remove %s: %v", filePath, err)
-		}
-	}
+	type bundleInfo struct {
+		entry os.DirEntry
+		major int
+		minor int
+		patch int
+		arch  string
+	}
+
+	groups := map[string][]bundleInfo{}
+	for _, file := range bundleFiles {
+		info, ok := parseBundleInfo(file.Name())
+		if !ok {
+			logging.Warnf("Skipping bundle with unrecognized version format: %s", file.Name())
+			continue
+		}
+		info.entry = file
+		key := fmt.Sprintf("%d.%d/%s", info.major, info.minor, info.arch)
+		groups[key] = append(groups[key], info)
+	}
+
+	for _, group := range groups {
+		sort.Slice(group, func(i, j int) bool {
+			return group[i].patch > group[j].patch
+		})
+		for i := keep; i < len(group); i++ {
+			file := group[i].entry
+			filePath := filepath.Join(cacheDir, file.Name())
+			logging.Infof("Pruning old bundle: %s", file.Name())
+			if err := os.RemoveAll(filePath); err != nil {
+				logging.Errorf("Failed to remove %s: %v", filePath, err)
+			}
+		}
+	}
 
 	return nil
 }
+
+func parseBundleInfo(name string) (bundleInfo, bool) {
+	base := strings.TrimSuffix(name, ".crcbundle")
+	parts := strings.Split(base, "_")
+	if len(parts) < 3 {
+		return bundleInfo{}, false
+	}
+	versionStr := parts[len(parts)-2]
+	arch := parts[len(parts)-1]
+	verParts := strings.Split(versionStr, ".")
+	if len(verParts) != 3 {
+		return bundleInfo{}, false
+	}
+	major, err1 := strconv.Atoi(verParts[0])
+	minor, err2 := strconv.Atoi(verParts[1])
+	patch, err3 := strconv.Atoi(verParts[2])
+	if err1 != nil || err2 != nil || err3 != nil {
+		return bundleInfo{}, false
+	}
+	return bundleInfo{major: major, minor: minor, patch: patch, arch: arch}, true
+}