diff --git a/test/bin/build_images.sh b/test/bin/build_images.sh
index 776f561083..7a30a997d1 100755
--- a/test/bin/build_images.sh
+++ b/test/bin/build_images.sh
@@ -300,6 +300,14 @@ do_group() {
 
         blueprint=$(get_blueprint_name "${blueprint_file}")
 
+        if sudo composer-cli blueprints list | grep -q "^${blueprint}$"; then
+            echo "Removing existing definition of ${blueprint}"
+            sudo composer-cli blueprints delete "${blueprint}"
+        fi
+
+        echo "Loading new definition of ${blueprint}"
+        sudo composer-cli blueprints push "${blueprint_file}"
+
         # Check if the image for this blueprint already exists, in
         # case it was downloaded from the cache.
         if ostree summary --view --repo="${IMAGEDIR}/repo" | grep -q " ${blueprint}\$"; then
@@ -310,14 +318,6 @@ do_group() {
             fi
         fi
 
-        if sudo composer-cli blueprints list | grep -q "^${blueprint}$"; then
-            echo "Removing existing definition of ${blueprint}"
-            sudo composer-cli blueprints delete "${blueprint}"
-        fi
-
-        echo "Loading new definition of ${blueprint}"
-        sudo composer-cli blueprints push "${blueprint_file}"
-
         echo "Resolving dependencies for ${blueprint}"
         # shellcheck disable=SC2024  # redirect and sudo
         if sudo composer-cli blueprints depsolve "${blueprint}" \
@@ -381,6 +381,11 @@ do_group() {
                 fi
             fi
             blueprint=$("${GOMPLATE}" --file "${image_installer}")
+            if [ -z "${blueprint}" ]; then
+                echo "Skipping ${image_installer}: blueprint name is empty (environment variables may not be set)"
+                record_junit "${groupdir}" "${image_installer}" "compose" "SKIPPED"
+                continue
+            fi
             local expected_iso_file="${VM_DISK_BASEDIR}/${blueprint}.iso"
             if [ -f "${expected_iso_file}" ]; then
                 echo "${expected_iso_file} already exists"
diff --git a/test/image-blueprints/layer4-release/group4/rhel96-brew-ec-with-optionals.image-installer b/test/image-blueprints/layer4-release/group4/rhel96-brew-ec-with-optionals.image-installer
new file mode 100644
index 0000000000..505d616ccb
--- /dev/null
+++ b/test/image-blueprints/layer4-release/group4/rhel96-brew-ec-with-optionals.image-installer
@@ -0,0 +1,3 @@
+{{- if and (env.Getenv "BREW_EC_RELEASE_VERSION" "") (env.Getenv "BREW_Y1_RELEASE_VERSION" "") -}}
+rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION }}-ec
+{{- end -}}
diff --git a/test/image-blueprints/layer4-release/group4/rhel96-brew-rc-with-optionals.image-installer b/test/image-blueprints/layer4-release/group4/rhel96-brew-rc-with-optionals.image-installer
new file mode 100644
index 0000000000..c280a7261b
--- /dev/null
+++ b/test/image-blueprints/layer4-release/group4/rhel96-brew-rc-with-optionals.image-installer
@@ -0,0 +1,3 @@
+{{- if and (env.Getenv "BREW_RC_RELEASE_VERSION" "") (env.Getenv "BREW_Y1_RELEASE_VERSION" "") -}}
+rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION}}-rc
+{{- end -}}
diff --git a/test/image-blueprints/layer4-release/group4/rhel96-brew-zstream-with-optionals.image-installer b/test/image-blueprints/layer4-release/group4/rhel96-brew-zstream-with-optionals.image-installer
new file mode 100644
index 0000000000..8c4315d9f6
--- /dev/null
+++ b/test/image-blueprints/layer4-release/group4/rhel96-brew-zstream-with-optionals.image-installer
@@ -0,0 +1,3 @@
+{{- if and (env.Getenv "BREW_Y0_RELEASE_VERSION" "") (env.Getenv "BREW_Y1_RELEASE_VERSION" "") -}}
+rhel-9.6-microshift-brew-optionals-4.{{ .Env.MINOR_VERSION }}-zstream 2Code has comments. Press enter to view.
+{{- end -}}
diff --git a/test/scenarios/releases/el96-lrel@standard1.sh b/test/scenarios/releases/el96-lrel@iso-standard1.sh
similarity index 100%
rename from test/scenarios/releases/el96-lrel@standard1.sh
rename to test/scenarios/releases/el96-lrel@iso-standard1.sh
diff --git a/test/scenarios/releases/el96-lrel@standard2.sh b/test/scenarios/releases/el96-lrel@iso-standard2.sh
similarity index 100%
rename from test/scenarios/releases/el96-lrel@standard2.sh
rename to test/scenarios/releases/el96-lrel@iso-standard2.sh