diff --git a/test/bin/ci_phase_iso_build.sh b/test/bin/ci_phase_iso_build.sh
index 46e963adb4..e257ee1eeb 100755
--- a/test/bin/ci_phase_iso_build.sh
+++ b/test/bin/ci_phase_iso_build.sh
@@ -68,7 +68,7 @@ update_build_cache() {
     $(dry_run) bash -x ./bin/build_images.sh -l ./image-blueprints/layer4-release
     # 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/layer5-release
+    $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer4-release
 
     # Prepare for the cache upload by stopping composer services and cleaning
     # temporary artifacts
@@ -129,14 +129,14 @@ run_bootc_image_build() {
             $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer3-periodic
         fi
         if [[ "${CI_JOB_NAME}" =~ .*upstream.* ]]; then
-            $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer4-upstream
+            $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer5-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-upstream
-        $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer5-release
+        $(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
     fi
 }
 
diff --git a/test/image-blueprints-bootc/layer5-release/group1/rhel100-bootc-brew-lrel-optional.containerfile b/test/image-blueprints-bootc/layer4-release/group1/rhel100-bootc-brew-lrel-optional.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-release/group1/rhel100-bootc-brew-lrel-optional.containerfile
rename to test/image-blueprints-bootc/layer4-release/group1/rhel100-bootc-brew-lrel-optional.containerfile
diff --git a/test/image-blueprints-bootc/layer5-release/group1/rhel100-bootc-brew.containerfile b/test/image-blueprints-bootc/layer4-release/group1/rhel100-bootc-brew.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-release/group1/rhel100-bootc-brew.containerfile
rename to test/image-blueprints-bootc/layer4-release/group1/rhel100-bootc-brew.containerfile
diff --git a/test/image-blueprints-bootc/layer5-release/group1/rhel96-bootc-brew-lrel-optional.containerfile b/test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-lrel-optional.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-release/group1/rhel96-bootc-brew-lrel-optional.containerfile
rename to test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-lrel-optional.containerfile
diff --git a/test/image-blueprints-bootc/layer5-release/group1/rhel96-bootc-brew-nightly-with-optional.containerfile b/test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-nightly-with-optional.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-release/group1/rhel96-bootc-brew-nightly-with-optional.containerfile
rename to test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-nightly-with-optional.containerfile
diff --git a/test/image-blueprints-bootc/layer5-release/group1/rhel96-bootc-brew-y1-with-optional.containerfile b/test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-y1-with-optional.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-release/group1/rhel96-bootc-brew-y1-with-optional.containerfile
rename to test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-y1-with-optional.containerfile
diff --git a/test/image-blueprints-bootc/layer5-release/group1/rhel96-bootc-brew-y2-with-optional.containerfile b/test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-y2-with-optional.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-release/group1/rhel96-bootc-brew-y2-with-optional.containerfile
rename to test/image-blueprints-bootc/layer4-release/group1/rhel96-bootc-brew-y2-with-optional.containerfile
diff --git a/test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-lrel-fips.containerfile b/test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-fips.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-lrel-fips.containerfile
rename to test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-fips.containerfile
diff --git a/test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-lrel-optional.image-bootc b/test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-optional.image-bootc
similarity index 100%
rename from test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-lrel-optional.image-bootc
rename to test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-optional.image-bootc
diff --git a/test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-lrel-tuned.containerfile b/test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-tuned.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-lrel-tuned.containerfile
rename to test/image-blueprints-bootc/layer4-release/group2/rhel96-bootc-brew-lrel-tuned.containerfile
diff --git a/test/image-blueprints-bootc/layer4-upstream/group1/cos10-test-agent.containerfile b/test/image-blueprints-bootc/layer5-upstream/group1/cos10-test-agent.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-upstream/group1/cos10-test-agent.containerfile
rename to test/image-blueprints-bootc/layer5-upstream/group1/cos10-test-agent.containerfile
diff --git a/test/image-blueprints-bootc/layer4-upstream/group1/cos9-test-agent.containerfile b/test/image-blueprints-bootc/layer5-upstream/group1/cos9-test-agent.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-upstream/group1/cos9-test-agent.containerfile
rename to test/image-blueprints-bootc/layer5-upstream/group1/cos9-test-agent.containerfile
diff --git a/test/image-blueprints-bootc/layer4-upstream/group2/centos10-bootc.image-bootc b/test/image-blueprints-bootc/layer5-upstream/group2/centos10-bootc.image-bootc
similarity index 100%
rename from test/image-blueprints-bootc/layer4-upstream/group2/centos10-bootc.image-bootc
rename to test/image-blueprints-bootc/layer5-upstream/group2/centos10-bootc.image-bootc
diff --git a/test/image-blueprints-bootc/layer4-upstream/group2/centos9-bootc.image-bootc b/test/image-blueprints-bootc/layer5-upstream/group2/centos9-bootc.image-bootc
similarity index 100%
rename from test/image-blueprints-bootc/layer4-upstream/group2/centos9-bootc.image-bootc
rename to test/image-blueprints-bootc/layer5-upstream/group2/centos9-bootc.image-bootc
diff --git a/test/image-blueprints-bootc/layer4-upstream/group2/cos10-bootc-source.containerfile b/test/image-blueprints-bootc/layer5-upstream/group2/cos10-bootc-source.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-upstream/group2/cos10-bootc-source.containerfile
rename to test/image-blueprints-bootc/layer5-upstream/group2/cos10-bootc-source.containerfile
diff --git a/test/image-blueprints-bootc/layer4-upstream/group2/cos9-bootc-source.containerfile b/test/image-blueprints-bootc/layer5-upstream/group2/cos9-bootc-source.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-upstream/group2/cos9-bootc-source.containerfile
rename to test/image-blueprints-bootc/layer5-upstream/group2/cos9-bootc-source.containerfile
diff --git a/test/image-blueprints-bootc/layer4-upstream/group3/cos10-bootc-source-isolated.containerfile b/test/image-blueprints-bootc/layer5-upstream/group3/cos10-bootc-source-isolated.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-upstream/group3/cos10-bootc-source-isolated.containerfile
rename to test/image-blueprints-bootc/layer5-upstream/group3/cos10-bootc-source-isolated.containerfile
diff --git a/test/image-blueprints-bootc/layer4-upstream/group3/cos10-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/layer5-upstream/group3/cos10-bootc-source-optionals.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-upstream/group3/cos10-bootc-source-optionals.containerfile
rename to test/image-blueprints-bootc/layer5-upstream/group3/cos10-bootc-source-optionals.containerfile
diff --git a/test/image-blueprints-bootc/layer4-upstream/group3/cos9-bootc-source-isolated.containerfile b/test/image-blueprints-bootc/layer5-upstream/group3/cos9-bootc-source-isolated.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-upstream/group3/cos9-bootc-source-isolated.containerfile
rename to test/image-blueprints-bootc/layer5-upstream/group3/cos9-bootc-source-isolated.containerfile
diff --git a/test/image-blueprints-bootc/layer4-upstream/group3/cos9-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/layer5-upstream/group3/cos9-bootc-source-optionals.containerfile
similarity index 100%
rename from test/image-blueprints-bootc/layer4-upstream/group3/cos9-bootc-source-optionals.containerfile
rename to test/image-blueprints-bootc/layer5-upstream/group3/cos9-bootc-source-optionals.containerfile