diff --git a/test/bin/ci_phase_iso_build.sh b/test/bin/ci_phase_iso_build.sh
index 922e94cb71..5221342af1 100755
--- a/test/bin/ci_phase_iso_build.sh
+++ b/test/bin/ci_phase_iso_build.sh
@@ -66,9 +66,14 @@ update_build_cache() {
     # Build the composer-cli base layer and brew RPMs to be cached
     $(dry_run) bash -x ./bin/build_images.sh -l ./image-blueprints/layer1-base
     $(dry_run) bash -x ./bin/build_images.sh -l ./image-blueprints/layer4-release
+
+    # Build templates
+    $(dry_run) bash -x ./bin/build_bootc_images.sh -g ./image-blueprints-bootc/templates
     # Build the bootc base layer and brew RPMs to be cached
     $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer1-base
-    $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer4-release
+    for os in el9 el10; do
+        $(dry_run) bash -x ./bin/build_bootc_images.sh -l "./image-blueprints-bootc/${os}/layer4-release"
+    done
 
     # Prepare for the cache upload by stopping composer services and cleaning
     # temporary artifacts
@@ -115,28 +120,44 @@ run_image_build() {
 run_bootc_image_build() {
     make -C "${ROOTDIR}" verify-containers
 
+    # Build templates first
+    $(dry_run) bash -x ./bin/build_bootc_images.sh -g ./image-blueprints-bootc/templates
+
     if [ -v CI_JOB_NAME ] ; then
-        # Skip all image builds for release testing CI jobs because all the images are fetched from the cache.
-        if [[ "${CI_JOB_NAME}" =~ .*release(-arm)?$ ]]; then
-            $(dry_run) bash -x ./bin/build_bootc_images.sh -X
-            return
-        fi
 
-        $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer1-base
-        $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer2-presubmit
+        local -r os="${CI_JOB_NAME##*-}"
+    
+        if [[ "${os}" == "el9" || "${os}" == "el10" ]]; then
 
-        if [[ "${CI_JOB_NAME}" =~ .*periodic.* ]]; then
-            $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer3-periodic
+            $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer1-base
+            $(dry_run) bash -x ./bin/build_bootc_images.sh -l "./image-blueprints-bootc/${os}/layer2-presubmit"
+
+            if [[ "${os}" == "el10" ]]; then
+                # Build el9 images for upgrade tests
+                $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/el9/layer2-presubmit
+            fi
+
+            if [[ "${CI_JOB_NAME}" =~ .*periodic.* ]]; then
+                $(dry_run) bash -x ./bin/build_bootc_images.sh -l "./image-blueprints-bootc/${os}/layer3-periodic"
+            fi
+            if [[ "${CI_JOB_NAME}" =~ .*release.* ]]; then
+                $(dry_run) bash -x ./bin/build_bootc_images.sh -l "./image-blueprints-bootc/${os}/layer4-release"
+            fi
         fi
+        
+        # Build upstream images
         if [[ "${CI_JOB_NAME}" =~ .*upstream.* ]]; then
-            $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer5-upstream
+            $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/upstream
         fi
     else
-        $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer1-base
-        $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer2-presubmit
-        $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer3-periodic
-        $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer4-release
-        $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer5-upstream
+            $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer1-base
+        # Full build for all OS versions
+        for os_ver in el9 el10; do
+            $(dry_run) bash -x ./bin/build_bootc_images.sh -l "./image-blueprints-bootc/${os_ver}/layer2-presubmit"
+            $(dry_run) bash -x ./bin/build_bootc_images.sh -l "./image-blueprints-bootc/${os_ver}/layer3-periodic"
+            $(dry_run) bash -x ./bin/build_bootc_images.sh -l "./image-blueprints-bootc/${os_ver}/layer4-release"
+        done
+        $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/upstream
     fi
 }
 
diff --git a/test/bin/manage_build_cache.sh b/test/bin/manage_build_cache.sh
index edfa245310..9b722f5570 100755
--- a/test/bin/manage_build_cache.sh
+++ b/test/bin/manage_build_cache.sh
@@ -7,7 +7,8 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck source=test/bin/common.sh
 source "${SCRIPTDIR}/common.sh"
 
-AWS_BUCKET_NAME="${AWS_BUCKET_NAME:-microshift-build-cache}"
+#AWS_BUCKET_NAME="${AWS_BUCKET_NAME:-microshift-build-cache}"
+AWS_BUCKET_NAME="thalenar-test2-cache-us-west-2"
 BCH_SUBDIR=
 TAG_SUBDIR=
 ARCH_SUBDIR="${UNAME_M}"
diff --git a/test/image-blueprints-bootc/layer2-presubmit/group1/rhel102-bootc-source.containerfile b/test/image-blueprints-bootc/el10/layer2-presubmit/group1/rhel102-bootc-source.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer2-presubmit/group1/rhel102-bootc-source.containerfile
rename to test/image-blueprints-bootc/el10/layer2-presubmit/group1/rhel102-bootc-source.containerfile
diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/el10/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile
rename to test/image-blueprints-bootc/el10/layer2-presubmit/group2/rhel102-bootc-source-optionals.containerfile
diff --git a/test/image-blueprints-bootc/el10/layer3-periodic/group1/rhel102-bootc-source-isolated.containerfile b/test/image-blueprints-bootc/el10/layer3-periodic/group1/rhel102-bootc-source-isolated.containerfile
new file mode 100644
index 0000000000..8ece10849a
--- /dev/null
+++ b/test/image-blueprints-bootc/el10/layer3-periodic/group1/rhel102-bootc-source-isolated.containerfile
@@ -0,0 +1,34 @@
+FROM localhost/rhel102-bootc-source:latest
+
+# The qemu-guest-agent is used in offline tests
+RUN dnf install -y qemu-guest-agent && \
+    systemctl enable qemu-guest-agent && \
+    dnf clean all
+
+# Override the default qemu-ga service configuration on the guest to allow all RPCs.
+# BLOCK_RPCS is a deny-list of qemu-guest-agent RPCs to block, such as file read/write, process execution, etc. By
+# default, all RPCs are blocked.
+# FREEZE_HOOK_PATHNAME is the dir-path containing hook scripts. This override does not change the default value.
+# These scripts are executed before or after guest image snapshot ops ("freezing" and "thawing" in libvirt speak).
+# No hooks are installed by default.
+RUN printf '\
+\# This is a systemd environment file, not a shell script.\n\
+\# It provides settings for "/lib/systemd/system/qemu-guest-agent.service".\n\
+BLOCK_RPCS=\n\
+FSFREEZE_HOOK_PATHNAME=/etc/qemu-ga/fsfreeze-hook\n' > /etc/sysconfig/qemu-ga
+
+# Embed images based on contents of release-info RPMs
+COPY --chmod=755 ./bootc-images/microshift-copy-images.sh /usr/bin/microshift-copy-images
+RUN --mount=type=secret,id=pullsecret,dst=/run/secrets/pull-secret.json \
+    images="$(jq -r ".images[]" /usr/share/microshift/release/release-"$(uname -m)".json)" ; \
+    images="${images} quay.io/microshift/busybox:1.36" ; \
+    IMAGE_PULL_LIST="${images}" /usr/bin/microshift-copy-images pull
+
+# Install a systemd drop-in unit to address the problem with image upgrades
+# overwriting the container images in additional store. The workaround is to
+# copy the images from the pre-loaded to the main container storage.
+# In this case, it is not necessary to update /etc/containers/storage.conf with
+# the additional store path.
+# See https://issues.redhat.com/browse/RHEL-75827
+RUN mkdir -p /usr/lib/systemd/system/microshift.service.d
+COPY --chmod=644 ./bootc-images/microshift-copy-images.conf /usr/lib/systemd/system/microshift.service.d/microshift-copy-images.conf
diff --git a/test/image-blueprints-bootc/el10/layer3-periodic/group2/rhel102-bootc-source-isolated.image-bootc b/test/image-blueprints-bootc/el10/layer3-periodic/group2/rhel102-bootc-source-isolated.image-bootc
new file mode 100644
index 0000000000..95731135e9
--- /dev/null
+++ b/test/image-blueprints-bootc/el10/layer3-periodic/group2/rhel102-bootc-source-isolated.image-bootc
@@ -0,0 +1 @@
+localhost/rhel102-bootc-source-isolated:latest
\ No newline at end of file
diff --git a/test/image-blueprints-bootc/layer4-release/group1/rhel102-bootc-brew-lrel-optional.containerfile b/test/image-blueprints-bootc/el10/layer4-release/group1/rhel102-bootc-brew-lrel-optional.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-release/group1/rhel102-bootc-brew-lrel-optional.containerfile
rename to test/image-blueprints-bootc/el10/layer4-release/group1/rhel102-bootc-brew-lrel-optional.containerfile
diff --git a/test/image-blueprints-bootc/layer4-release/group1/rhel102-bootc-brew.containerfile b/test/image-blueprints-bootc/el10/layer4-release/group1/rhel102-bootc-brew.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-release/group1/rhel102-bootc-brew.containerfile
rename to test/image-blueprints-bootc/el10/layer4-release/group1/rhel102-bootc-brew.containerfile
diff --git a/test/image-blueprints-bootc/el10/layer4-release/group2/rhel102-bootc-brew-lrel-optional.image-bootc b/test/image-blueprints-bootc/el10/layer4-release/group2/rhel102-bootc-brew-lrel-optional.image-bootc
new file mode 100644
index 0000000000..f7c8c65602
--- /dev/null
+++ b/test/image-blueprints-bootc/el10/layer4-release/group2/rhel102-bootc-brew-lrel-optional.image-bootc
@@ -0,0 +1,3 @@
+{{- if env.Getenv "BREW_LREL_RELEASE_VERSION" "" -}}
+localhost/rhel102-bootc-brew-lrel-optional:latest
+{{- end }}
diff --git a/test/image-blueprints-bootc/layer2-presubmit/group1/rhel98-bootc-source-base.containerfile b/test/image-blueprints-bootc/el9/layer2-presubmit/group1/rhel98-bootc-source-base.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer2-presubmit/group1/rhel98-bootc-source-base.containerfile
rename to test/image-blueprints-bootc/el9/layer2-presubmit/group1/rhel98-bootc-source-base.containerfile
diff --git a/test/image-blueprints-bootc/layer2-presubmit/group1/rhel98-bootc-source.containerfile b/test/image-blueprints-bootc/el9/layer2-presubmit/group1/rhel98-bootc-source.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer2-presubmit/group1/rhel98-bootc-source.containerfile
rename to test/image-blueprints-bootc/el9/layer2-presubmit/group1/rhel98-bootc-source.containerfile
diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-aux.containerfile b/test/image-blueprints-bootc/el9/layer2-presubmit/group2/rhel98-bootc-source-aux.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-aux.containerfile
rename to test/image-blueprints-bootc/el9/layer2-presubmit/group2/rhel98-bootc-source-aux.containerfile
diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-fake-next-minor.containerfile b/test/image-blueprints-bootc/el9/layer2-presubmit/group2/rhel98-bootc-source-fake-next-minor.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-fake-next-minor.containerfile
rename to test/image-blueprints-bootc/el9/layer2-presubmit/group2/rhel98-bootc-source-fake-next-minor.containerfile
diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-fips.containerfile b/test/image-blueprints-bootc/el9/layer2-presubmit/group2/rhel98-bootc-source-fips.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-fips.containerfile
rename to test/image-blueprints-bootc/el9/layer2-presubmit/group2/rhel98-bootc-source-fips.containerfile
diff --git a/test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/el9/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile
rename to test/image-blueprints-bootc/el9/layer2-presubmit/group2/rhel98-bootc-source-optionals.containerfile
diff --git a/test/image-blueprints-bootc/layer3-periodic/group1/rhel98-bootc-source-ai-model-serving.containerfile b/test/image-blueprints-bootc/el9/layer3-periodic/group1/rhel98-bootc-source-ai-model-serving.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer3-periodic/group1/rhel98-bootc-source-ai-model-serving.containerfile
rename to test/image-blueprints-bootc/el9/layer3-periodic/group1/rhel98-bootc-source-ai-model-serving.containerfile
diff --git a/test/image-blueprints-bootc/layer3-periodic/group1/rhel98-bootc-source-isolated.containerfile b/test/image-blueprints-bootc/el9/layer3-periodic/group1/rhel98-bootc-source-isolated.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer3-periodic/group1/rhel98-bootc-source-isolated.containerfile
rename to test/image-blueprints-bootc/el9/layer3-periodic/group1/rhel98-bootc-source-isolated.containerfile
diff --git a/test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-ai-model-serving.image-bootc b/test/image-blueprints-bootc/el9/layer3-periodic/group2/rhel98-bootc-source-ai-model-serving.image-bootc
similarity index 100%
rename from test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-ai-model-serving.image-bootc
rename to test/image-blueprints-bootc/el9/layer3-periodic/group2/rhel98-bootc-source-ai-model-serving.image-bootc
diff --git a/test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-gitops.containerfile b/test/image-blueprints-bootc/el9/layer3-periodic/group2/rhel98-bootc-source-gitops.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-gitops.containerfile
rename to test/image-blueprints-bootc/el9/layer3-periodic/group2/rhel98-bootc-source-gitops.containerfile
diff --git a/test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-isolated.image-bootc b/test/image-blueprints-bootc/el9/layer3-periodic/group2/rhel98-bootc-source-isolated.image-bootc
similarity index 100%
rename from test/image-blueprints-bootc/layer3-periodic/group2/rhel98-bootc-source-isolated.image-bootc
rename to test/image-blueprints-bootc/el9/layer3-periodic/group2/rhel98-bootc-source-isolated.image-bootc
diff --git a/test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-y1-with-optional.containerfile b/test/image-blueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y1-with-optional.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-y1-with-optional.containerfile
rename to test/image-blueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y1-with-optional.containerfile
diff --git a/test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-y2-with-optional.containerfile b/test/image-blueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y2-with-optional.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-y2-with-optional.containerfile
rename to test/image-blueprints-bootc/el9/layer4-release/group1/rhel96-bootc-brew-y2-with-optional.containerfile
diff --git a/test/image-blueprints-bootc/layer4-release/group1/rhel98-bootc-brew-lrel-optional.containerfile b/test/image-blueprints-bootc/el9/layer4-release/group1/rhel98-bootc-brew-lrel-optional.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-release/group1/rhel98-bootc-brew-lrel-optional.containerfile
rename to test/image-blueprints-bootc/el9/layer4-release/group1/rhel98-bootc-brew-lrel-optional.containerfile
diff --git a/test/image-blueprints-bootc/layer4-release/group1/rhel98-bootc-brew-nightly-with-optional.containerfile b/test/image-blueprints-bootc/el9/layer4-release/group1/rhel98-bootc-brew-nightly-with-optional.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-release/group1/rhel98-bootc-brew-nightly-with-optional.containerfile
rename to test/image-blueprints-bootc/el9/layer4-release/group1/rhel98-bootc-brew-nightly-with-optional.containerfile
diff --git a/test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-fips.containerfile b/test/image-blueprints-bootc/el9/layer4-release/group2/rhel98-bootc-brew-lrel-fips.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-fips.containerfile
rename to test/image-blueprints-bootc/el9/layer4-release/group2/rhel98-bootc-brew-lrel-fips.containerfile
diff --git a/test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-optional.image-bootc b/test/image-blueprints-bootc/el9/layer4-release/group2/rhel98-bootc-brew-lrel-optional.image-bootc
similarity index 100%
rename from test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-optional.image-bootc
rename to test/image-blueprints-bootc/el9/layer4-release/group2/rhel98-bootc-brew-lrel-optional.image-bootc
diff --git a/test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-tuned.containerfile b/test/image-blueprints-bootc/el9/layer4-release/group2/rhel98-bootc-brew-lrel-tuned.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-release/group2/rhel98-bootc-brew-lrel-tuned.containerfile
rename to test/image-blueprints-bootc/el9/layer4-release/group2/rhel98-bootc-brew-lrel-tuned.containerfile
diff --git a/test/image-blueprints-bootc/layer3-periodic/group1/ai-model-serving-test-data.sh.template b/test/image-blueprints-bootc/templates/ai-model-serving-test-data.sh.template
similarity index 100%
rename from test/image-blueprints-bootc/layer3-periodic/group1/ai-model-serving-test-data.sh.template
rename to test/image-blueprints-bootc/templates/ai-model-serving-test-data.sh.template
diff --git a/test/image-blueprints-bootc/layer1-base/group2/build-serialsim.sh.template b/test/image-blueprints-bootc/templates/build-serialsim.sh.template
similarity index 100%
rename from test/image-blueprints-bootc/layer1-base/group2/build-serialsim.sh.template
rename to test/image-blueprints-bootc/templates/build-serialsim.sh.template
diff --git a/test/image-blueprints-bootc/layer1-base/group2/microshift-copy-images.conf.template b/test/image-blueprints-bootc/templates/microshift-copy-images.conf.template
similarity index 100%
rename from test/image-blueprints-bootc/layer1-base/group2/microshift-copy-images.conf.template
rename to test/image-blueprints-bootc/templates/microshift-copy-images.conf.template
diff --git a/test/image-blueprints-bootc/layer1-base/group2/microshift-copy-images.sh.template b/test/image-blueprints-bootc/templates/microshift-copy-images.sh.template
similarity index 100%
rename from test/image-blueprints-bootc/layer1-base/group2/microshift-copy-images.sh.template
rename to test/image-blueprints-bootc/templates/microshift-copy-images.sh.template
diff --git a/test/image-blueprints-bootc/layer2-presubmit/group1/microshift-ovsdb-ownership.conf.template b/test/image-blueprints-bootc/templates/microshift-ovsdb-ownership.conf.template
similarity index 100%
rename from test/image-blueprints-bootc/layer2-presubmit/group1/microshift-ovsdb-ownership.conf.template
rename to test/image-blueprints-bootc/templates/microshift-ovsdb-ownership.conf.template
diff --git a/test/image-blueprints-bootc/layer1-base/group1/rpm-repo-config.sh.template b/test/image-blueprints-bootc/templates/rpm-repo-config.sh.template
similarity index 100%
rename from test/image-blueprints-bootc/layer1-base/group1/rpm-repo-config.sh.template
rename to test/image-blueprints-bootc/templates/rpm-repo-config.sh.template
diff --git a/test/image-blueprints-bootc/layer5-upstream/group1/cos10-test-agent.containerfile b/test/image-blueprints-bootc/upstream/group1/cos10-test-agent.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-upstream/group1/cos10-test-agent.containerfile
rename to test/image-blueprints-bootc/upstream/group1/cos10-test-agent.containerfile
diff --git a/test/image-blueprints-bootc/layer5-upstream/group1/cos9-test-agent.containerfile b/test/image-blueprints-bootc/upstream/group1/cos9-test-agent.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-upstream/group1/cos9-test-agent.containerfile
rename to test/image-blueprints-bootc/upstream/group1/cos9-test-agent.containerfile
diff --git a/test/image-blueprints-bootc/layer5-upstream/group2/centos10-bootc.image-bootc b/test/image-blueprints-bootc/upstream/group2/centos10-bootc.image-bootc
similarity index 100%
rename from test/image-blueprints-bootc/layer5-upstream/group2/centos10-bootc.image-bootc
rename to test/image-blueprints-bootc/upstream/group2/centos10-bootc.image-bootc
diff --git a/test/image-blueprints-bootc/layer5-upstream/group2/centos9-bootc.image-bootc b/test/image-blueprints-bootc/upstream/group2/centos9-bootc.image-bootc
similarity index 100%
rename from test/image-blueprints-bootc/layer5-upstream/group2/centos9-bootc.image-bootc
rename to test/image-blueprints-bootc/upstream/group2/centos9-bootc.image-bootc
diff --git a/test/image-blueprints-bootc/layer5-upstream/group2/cos10-bootc-source.containerfile b/test/image-blueprints-bootc/upstream/group2/cos10-bootc-source.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-upstream/group2/cos10-bootc-source.containerfile
rename to test/image-blueprints-bootc/upstream/group2/cos10-bootc-source.containerfile
diff --git a/test/image-blueprints-bootc/layer5-upstream/group2/cos9-bootc-source.containerfile b/test/image-blueprints-bootc/upstream/group2/cos9-bootc-source.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-upstream/group2/cos9-bootc-source.containerfile
rename to test/image-blueprints-bootc/upstream/group2/cos9-bootc-source.containerfile
diff --git a/test/image-blueprints-bootc/layer5-upstream/group3/cos10-bootc-source-isolated.containerfile b/test/image-blueprints-bootc/upstream/group3/cos10-bootc-source-isolated.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-upstream/group3/cos10-bootc-source-isolated.containerfile
rename to test/image-blueprints-bootc/upstream/group3/cos10-bootc-source-isolated.containerfile
diff --git a/test/image-blueprints-bootc/layer5-upstream/group3/cos10-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/upstream/group3/cos10-bootc-source-optionals.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-upstream/group3/cos10-bootc-source-optionals.containerfile
rename to test/image-blueprints-bootc/upstream/group3/cos10-bootc-source-optionals.containerfile
diff --git a/test/image-blueprints-bootc/layer5-upstream/group3/cos9-bootc-source-isolated.containerfile b/test/image-blueprints-bootc/upstream/group3/cos9-bootc-source-isolated.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-upstream/group3/cos9-bootc-source-isolated.containerfile
rename to test/image-blueprints-bootc/upstream/group3/cos9-bootc-source-isolated.containerfile
diff --git a/test/image-blueprints-bootc/layer5-upstream/group3/cos9-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/upstream/group3/cos9-bootc-source-optionals.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-upstream/group3/cos9-bootc-source-optionals.containerfile
rename to test/image-blueprints-bootc/upstream/group3/cos9-bootc-source-optionals.containerfile
diff --git a/test/scenarios-bootc/periodics/el102-src@optional.sh b/test/scenarios-bootc/el10/periodics/el102-src@optional.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el102-src@optional.sh
rename to test/scenarios-bootc/el10/periodics/el102-src@optional.sh
diff --git a/test/scenarios-bootc/periodics/el102-src@standard-suite1.sh b/test/scenarios-bootc/el10/periodics/el102-src@standard-suite1.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el102-src@standard-suite1.sh
rename to test/scenarios-bootc/el10/periodics/el102-src@standard-suite1.sh
diff --git a/test/scenarios-bootc/periodics/el102-src@standard-suite2.sh b/test/scenarios-bootc/el10/periodics/el102-src@standard-suite2.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el102-src@standard-suite2.sh
rename to test/scenarios-bootc/el10/periodics/el102-src@standard-suite2.sh
diff --git a/test/scenarios-bootc/periodics/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/el10/periodics/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh
rename to test/scenarios-bootc/el10/periodics/el96-prel@el102-src@upgrade-ostree2bootc-ok.sh
diff --git a/test/scenarios-bootc/periodics/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/el10/periodics/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh
rename to test/scenarios-bootc/el10/periodics/el96-yminus2@el102-src@upgrade-ostree2bootc-ok.sh
diff --git a/test/scenarios-bootc/periodics/el98-src@el102-src@upgrade-ok.sh b/test/scenarios-bootc/el10/periodics/el98-src@el102-src@upgrade-ok.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el98-src@el102-src@upgrade-ok.sh
rename to test/scenarios-bootc/el10/periodics/el98-src@el102-src@upgrade-ok.sh
diff --git a/test/scenarios-bootc/presubmits/el96-prel@el102-src@upgrade-ok.sh b/test/scenarios-bootc/el10/presubmits/el96-prel@el102-src@upgrade-ok.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el96-prel@el102-src@upgrade-ok.sh
rename to test/scenarios-bootc/el10/presubmits/el96-prel@el102-src@upgrade-ok.sh
diff --git a/test/scenarios-bootc/presubmits/el96-yminus2@el102-src@upgrade-ok.sh b/test/scenarios-bootc/el10/presubmits/el96-yminus2@el102-src@upgrade-ok.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el96-yminus2@el102-src@upgrade-ok.sh
rename to test/scenarios-bootc/el10/presubmits/el96-yminus2@el102-src@upgrade-ok.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@el102-src@upgrade-ok.sh b/test/scenarios-bootc/el10/presubmits/el98-src@el102-src@upgrade-ok.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@el102-src@upgrade-ok.sh
rename to test/scenarios-bootc/el10/presubmits/el98-src@el102-src@upgrade-ok.sh
diff --git a/test/scenarios-bootc/releases/el102-lrel@ginkgo-tests.sh b/test/scenarios-bootc/el10/releases/el102-lrel@ginkgo-tests.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el102-lrel@ginkgo-tests.sh
rename to test/scenarios-bootc/el10/releases/el102-lrel@ginkgo-tests.sh
diff --git a/test/scenarios-bootc/releases/el102-lrel@optional.sh b/test/scenarios-bootc/el10/releases/el102-lrel@optional.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el102-lrel@optional.sh
rename to test/scenarios-bootc/el10/releases/el102-lrel@optional.sh
diff --git a/test/scenarios-bootc/releases/el102-lrel@standard1.sh b/test/scenarios-bootc/el10/releases/el102-lrel@standard1.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el102-lrel@standard1.sh
rename to test/scenarios-bootc/el10/releases/el102-lrel@standard1.sh
diff --git a/test/scenarios-bootc/releases/el102-lrel@standard2.sh b/test/scenarios-bootc/el10/releases/el102-lrel@standard2.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el102-lrel@standard2.sh
rename to test/scenarios-bootc/el10/releases/el102-lrel@standard2.sh
diff --git a/test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.sh b/test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.sh
rename to test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-fails-and-rolls-back.sh
diff --git a/test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-ok.sh b/test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-ok.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-ok.sh
rename to test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-ok.sh
diff --git a/test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-ostree2bootc-ok.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el96-prel@el98-src@upgrade-ostree2bootc-ok.sh
rename to test/scenarios-bootc/el9/periodics/el96-prel@el98-src@upgrade-ostree2bootc-ok.sh
diff --git a/test/scenarios-bootc/periodics/el96-yminus2@el98-src@upgrade-ok.sh b/test/scenarios-bootc/el9/periodics/el96-yminus2@el98-src@upgrade-ok.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el96-yminus2@el98-src@upgrade-ok.sh
rename to test/scenarios-bootc/el9/periodics/el96-yminus2@el98-src@upgrade-ok.sh
diff --git a/test/scenarios-bootc/periodics/el96-yminus2@el98-src@upgrade-ostree2bootc-ok.sh b/test/scenarios-bootc/el9/periodics/el96-yminus2@el98-src@upgrade-ostree2bootc-ok.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el96-yminus2@el98-src@upgrade-ostree2bootc-ok.sh
rename to test/scenarios-bootc/el9/periodics/el96-yminus2@el98-src@upgrade-ostree2bootc-ok.sh
diff --git a/test/scenarios-bootc/periodics/el98-src@ai-model-serving-offline.sh b/test/scenarios-bootc/el9/periodics/el98-src@ai-model-serving-offline.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el98-src@ai-model-serving-offline.sh
rename to test/scenarios-bootc/el9/periodics/el98-src@ai-model-serving-offline.sh
diff --git a/test/scenarios-bootc/periodics/el98-src@cncf-conformance.sh b/test/scenarios-bootc/el9/periodics/el98-src@cncf-conformance.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el98-src@cncf-conformance.sh
rename to test/scenarios-bootc/el9/periodics/el98-src@cncf-conformance.sh
diff --git a/test/scenarios-bootc/periodics/el98-src@fault-tests-and-greenboot.sh b/test/scenarios-bootc/el9/periodics/el98-src@fault-tests-and-greenboot.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el98-src@fault-tests-and-greenboot.sh
rename to test/scenarios-bootc/el9/periodics/el98-src@fault-tests-and-greenboot.sh
diff --git a/test/scenarios-bootc/periodics/el98-src@fips.sh b/test/scenarios-bootc/el9/periodics/el98-src@fips.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el98-src@fips.sh
rename to test/scenarios-bootc/el9/periodics/el98-src@fips.sh
diff --git a/test/scenarios-bootc/periodics/el98-src@gitops-telemetry-clusterid-systemd.sh b/test/scenarios-bootc/el9/periodics/el98-src@gitops-telemetry-clusterid-systemd.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el98-src@gitops-telemetry-clusterid-systemd.sh
rename to test/scenarios-bootc/el9/periodics/el98-src@gitops-telemetry-clusterid-systemd.sh
diff --git a/test/scenarios-bootc/periodics/el98-src@isolated-net.sh b/test/scenarios-bootc/el9/periodics/el98-src@isolated-net.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el98-src@isolated-net.sh
rename to test/scenarios-bootc/el9/periodics/el98-src@isolated-net.sh
diff --git a/test/scenarios-bootc/periodics/el98-src@offline.sh b/test/scenarios-bootc/el9/periodics/el98-src@offline.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el98-src@offline.sh
rename to test/scenarios-bootc/el9/periodics/el98-src@offline.sh
diff --git a/test/scenarios-bootc/periodics/el98-src@osconfig-cleanup-data.sh b/test/scenarios-bootc/el9/periodics/el98-src@osconfig-cleanup-data.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el98-src@osconfig-cleanup-data.sh
rename to test/scenarios-bootc/el9/periodics/el98-src@osconfig-cleanup-data.sh
diff --git a/test/scenarios-bootc/periodics/el98-src@osconfig-lifecycle.sh b/test/scenarios-bootc/el9/periodics/el98-src@osconfig-lifecycle.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el98-src@osconfig-lifecycle.sh
rename to test/scenarios-bootc/el9/periodics/el98-src@osconfig-lifecycle.sh
diff --git a/test/scenarios-bootc/periodics/el98-src@upgrade-fails-cannot-backup.sh b/test/scenarios-bootc/el9/periodics/el98-src@upgrade-fails-cannot-backup.sh
similarity index 100%
rename from test/scenarios-bootc/periodics/el98-src@upgrade-fails-cannot-backup.sh
rename to test/scenarios-bootc/el9/periodics/el98-src@upgrade-fails-cannot-backup.sh
diff --git a/test/scenarios-bootc/presubmits/el96-prel@el98-src@upgrade-ok.sh b/test/scenarios-bootc/el9/presubmits/el96-prel@el98-src@upgrade-ok.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el96-prel@el98-src@upgrade-ok.sh
rename to test/scenarios-bootc/el9/presubmits/el96-prel@el98-src@upgrade-ok.sh
diff --git a/test/scenarios-bootc/presubmits/el96-yminus2@el98-src@upgrade-ok.sh b/test/scenarios-bootc/el9/presubmits/el96-yminus2@el98-src@upgrade-ok.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el96-yminus2@el98-src@upgrade-ok.sh
rename to test/scenarios-bootc/el9/presubmits/el96-yminus2@el98-src@upgrade-ok.sh
diff --git a/test/scenarios-bootc/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh b/test/scenarios-bootc/el9/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh
rename to test/scenarios-bootc/el9/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh
diff --git a/test/scenarios-bootc/presubmits/el98-base@el98-src@upgrade-ok.sh b/test/scenarios-bootc/el9/presubmits/el98-base@el98-src@upgrade-ok.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-base@el98-src@upgrade-ok.sh
rename to test/scenarios-bootc/el9/presubmits/el98-base@el98-src@upgrade-ok.sh
diff --git a/test/scenarios-bootc/presubmits/el98-base@src@opt@delta-upgrade-ok.sh b/test/scenarios-bootc/el9/presubmits/el98-base@src@opt@delta-upgrade-ok.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-base@src@opt@delta-upgrade-ok.sh
rename to test/scenarios-bootc/el9/presubmits/el98-base@src@opt@delta-upgrade-ok.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@ai-model-serving-online.sh b/test/scenarios-bootc/el9/presubmits/el98-src@ai-model-serving-online.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@ai-model-serving-online.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@ai-model-serving-online.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@auto-recovery.sh b/test/scenarios-bootc/el9/presubmits/el98-src@auto-recovery.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@auto-recovery.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@auto-recovery.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@backup-and-restore-on-reboot.sh b/test/scenarios-bootc/el9/presubmits/el98-src@backup-and-restore-on-reboot.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@backup-and-restore-on-reboot.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@backup-and-restore-on-reboot.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@backups.sh b/test/scenarios-bootc/el9/presubmits/el98-src@backups.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@backups.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@backups.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@configuration.sh b/test/scenarios-bootc/el9/presubmits/el98-src@configuration.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@configuration.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@configuration.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@downgrade-block.sh b/test/scenarios-bootc/el9/presubmits/el98-src@downgrade-block.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@downgrade-block.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@downgrade-block.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@dual-stack.sh b/test/scenarios-bootc/el9/presubmits/el98-src@dual-stack.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@dual-stack.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@dual-stack.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@ipv6.sh b/test/scenarios-bootc/el9/presubmits/el98-src@ipv6.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@ipv6.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@ipv6.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@multi-nic.sh b/test/scenarios-bootc/el9/presubmits/el98-src@multi-nic.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@multi-nic.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@multi-nic.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@optional.sh b/test/scenarios-bootc/el9/presubmits/el98-src@optional.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@optional.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@optional.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@router.sh b/test/scenarios-bootc/el9/presubmits/el98-src@router.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@router.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@router.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@standard-suite1.sh b/test/scenarios-bootc/el9/presubmits/el98-src@standard-suite1.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@standard-suite1.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@standard-suite1.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@standard-suite2.sh b/test/scenarios-bootc/el9/presubmits/el98-src@standard-suite2.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@standard-suite2.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@standard-suite2.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@storage.sh b/test/scenarios-bootc/el9/presubmits/el98-src@storage.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@storage.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@storage.sh
diff --git a/test/scenarios-bootc/presubmits/el98-src@upgrade-fails-then-recovers.sh.disabled b/test/scenarios-bootc/el9/presubmits/el98-src@upgrade-fails-then-recovers.sh.disabled
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@upgrade-fails-then-recovers.sh.disabled
rename to test/scenarios-bootc/el9/presubmits/el98-src@upgrade-fails-then-recovers.sh.disabled
diff --git a/test/scenarios-bootc/presubmits/el98-src@upgrade-fails.sh b/test/scenarios-bootc/el9/presubmits/el98-src@upgrade-fails.sh
similarity index 100%
rename from test/scenarios-bootc/presubmits/el98-src@upgrade-fails.sh
rename to test/scenarios-bootc/el9/presubmits/el98-src@upgrade-fails.sh
diff --git a/test/scenarios-bootc/releases/el96-lrel@published-images-standard1.sh b/test/scenarios-bootc/el9/releases/el96-lrel@published-images-standard1.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el96-lrel@published-images-standard1.sh
rename to test/scenarios-bootc/el9/releases/el96-lrel@published-images-standard1.sh
diff --git a/test/scenarios-bootc/releases/el96-lrel@published-images-standard2.sh b/test/scenarios-bootc/el9/releases/el96-lrel@published-images-standard2.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el96-lrel@published-images-standard2.sh
rename to test/scenarios-bootc/el9/releases/el96-lrel@published-images-standard2.sh
diff --git a/test/scenarios-bootc/releases/el96-y1@el98-lrel@lvms.sh b/test/scenarios-bootc/el9/releases/el96-y1@el98-lrel@lvms.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el96-y1@el98-lrel@lvms.sh
rename to test/scenarios-bootc/el9/releases/el96-y1@el98-lrel@lvms.sh
diff --git a/test/scenarios-bootc/releases/el96-y1@el98-lrel@standard1.sh b/test/scenarios-bootc/el9/releases/el96-y1@el98-lrel@standard1.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el96-y1@el98-lrel@standard1.sh
rename to test/scenarios-bootc/el9/releases/el96-y1@el98-lrel@standard1.sh
diff --git a/test/scenarios-bootc/releases/el96-y1@el98-lrel@standard2.sh b/test/scenarios-bootc/el9/releases/el96-y1@el98-lrel@standard2.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el96-y1@el98-lrel@standard2.sh
rename to test/scenarios-bootc/el9/releases/el96-y1@el98-lrel@standard2.sh
diff --git a/test/scenarios-bootc/releases/el96-y2@el98-lrel@lvms.sh b/test/scenarios-bootc/el9/releases/el96-y2@el98-lrel@lvms.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el96-y2@el98-lrel@lvms.sh
rename to test/scenarios-bootc/el9/releases/el96-y2@el98-lrel@lvms.sh
diff --git a/test/scenarios-bootc/releases/el96-y2@el98-lrel@standard1.sh b/test/scenarios-bootc/el9/releases/el96-y2@el98-lrel@standard1.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el96-y2@el98-lrel@standard1.sh
rename to test/scenarios-bootc/el9/releases/el96-y2@el98-lrel@standard1.sh
diff --git a/test/scenarios-bootc/releases/el96-y2@el98-lrel@standard2.sh b/test/scenarios-bootc/el9/releases/el96-y2@el98-lrel@standard2.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el96-y2@el98-lrel@standard2.sh
rename to test/scenarios-bootc/el9/releases/el96-y2@el98-lrel@standard2.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@ai-model-serving-online.sh b/test/scenarios-bootc/el9/releases/el98-lrel@ai-model-serving-online.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@ai-model-serving-online.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@ai-model-serving-online.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@configuration.sh b/test/scenarios-bootc/el9/releases/el98-lrel@configuration.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@configuration.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@configuration.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@dual-stack.sh b/test/scenarios-bootc/el9/releases/el98-lrel@dual-stack.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@dual-stack.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@dual-stack.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@fips.sh b/test/scenarios-bootc/el9/releases/el98-lrel@fips.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@fips.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@fips.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@ginkgo-tests.sh b/test/scenarios-bootc/el9/releases/el98-lrel@ginkgo-tests.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@ginkgo-tests.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@ginkgo-tests.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@ipv6.sh b/test/scenarios-bootc/el9/releases/el98-lrel@ipv6.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@ipv6.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@ipv6.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@iso-standard1.sh b/test/scenarios-bootc/el9/releases/el98-lrel@iso-standard1.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@iso-standard1.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@iso-standard1.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@iso-standard2.sh b/test/scenarios-bootc/el9/releases/el98-lrel@iso-standard2.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@iso-standard2.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@iso-standard2.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@low-latency.sh b/test/scenarios-bootc/el9/releases/el98-lrel@low-latency.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@low-latency.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@low-latency.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@multi-config-standard1.sh b/test/scenarios-bootc/el9/releases/el98-lrel@multi-config-standard1.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@multi-config-standard1.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@multi-config-standard1.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@multi-config-standard2.sh b/test/scenarios-bootc/el9/releases/el98-lrel@multi-config-standard2.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@multi-config-standard2.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@multi-config-standard2.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@multi-nic.sh b/test/scenarios-bootc/el9/releases/el98-lrel@multi-nic.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@multi-nic.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@multi-nic.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@nightly-brew-standard1.sh b/test/scenarios-bootc/el9/releases/el98-lrel@nightly-brew-standard1.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@nightly-brew-standard1.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@nightly-brew-standard1.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@nightly-brew-standard2.sh b/test/scenarios-bootc/el9/releases/el98-lrel@nightly-brew-standard2.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@nightly-brew-standard2.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@nightly-brew-standard2.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@optional.sh b/test/scenarios-bootc/el9/releases/el98-lrel@optional.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@optional.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@optional.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@osconfig-router.sh b/test/scenarios-bootc/el9/releases/el98-lrel@osconfig-router.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@osconfig-router.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@osconfig-router.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@storage-telemetry.sh b/test/scenarios-bootc/el9/releases/el98-lrel@storage-telemetry.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@storage-telemetry.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@storage-telemetry.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@tlsv13-standard1.sh b/test/scenarios-bootc/el9/releases/el98-lrel@tlsv13-standard1.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@tlsv13-standard1.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@tlsv13-standard1.sh
diff --git a/test/scenarios-bootc/releases/el98-lrel@tlsv13-standard2.sh b/test/scenarios-bootc/el9/releases/el98-lrel@tlsv13-standard2.sh
similarity index 100%
rename from test/scenarios-bootc/releases/el98-lrel@tlsv13-standard2.sh
rename to test/scenarios-bootc/el9/releases/el98-lrel@tlsv13-standard2.sh