diff --git a/scripts/devenv-builder/configure-composer.sh b/scripts/devenv-builder/configure-composer.sh
index 4de872e592..22706e9652 100755
--- a/scripts/devenv-builder/configure-composer.sh
+++ b/scripts/devenv-builder/configure-composer.sh
@@ -9,11 +9,15 @@ install_and_configure_composer() {
     local -r version_id_major="$(awk -F. '{print $1}' <<< "${version_id}")"
 
     "${DNF_RETRY}" "install" "osbuild osbuild-composer"
-    "${DNF_RETRY}" "install" \
-        "git composer-cli ostree rpm-ostree \
-        cockpit-composer bash-completion podman runc genisoimage \
+
+    local packages="git composer-cli ostree rpm-ostree \
+        cockpit-composer bash-completion podman runc \
         createrepo yum-utils selinux-policy-devel jq wget lorax rpm-build \
-        containernetworking-plugins expect httpd-tools vim-common"
+        python3-psutil expect httpd-tools vim-common"
+    if [[ "${version_id_major}" -lt 10 ]]; then
+        packages+=" genisoimage containernetworking-plugins"
+    fi
+    "${DNF_RETRY}" "install" "${packages}"
 
     # The mock utility comes from the EPEL repository
     "${DNF_RETRY}" "install" "https://dl.fedoraproject.org/pub/epel/epel-release-latest-${version_id_major}.noarch.rpm"
diff --git a/test/bin/pyutils/build_bootc_images.py b/test/bin/pyutils/build_bootc_images.py
index d432db2bf3..2629f32eda 100644
--- a/test/bin/pyutils/build_bootc_images.py
+++ b/test/bin/pyutils/build_bootc_images.py
@@ -8,6 +8,7 @@
 import os
 import platform
 import re
+import subprocess
 import sys
 import time
 import traceback
@@ -219,7 +220,13 @@ def extract_container_images(version, repo_spec, outfile, dry_run=False):
 
     # Construct and execute the dnf download command
     dnf_command = ["dnf", "download"] + dnf_options + [f"microshift-release-info-{version}"]
-    if common.run_command(dnf_command, dry_run) is not None:
+    try:
+        result = common.run_command(dnf_command, dry_run)
+    except subprocess.CalledProcessError:
+        common.print_msg(f"Warning: failed to download release-info for {version} from {repo_spec}, skipping")
+        common.popd()
+        return
+    if result is not None:
         images_output = get_container_images(str(image_path), version)
         with open(outfile, "a") as f:
             f.write(images_output.replace(',', '\n'))