diff --git a/test/image-blueprints/layer1-base/group2/rhel93-microshift-yminus2.toml b/test/image-blueprints/layer1-base/group2/rhel93-microshift-yminus2.toml
new file mode 100644
index 0000000000..24afbb46de
--- /dev/null
+++ b/test/image-blueprints/layer1-base/group2/rhel93-microshift-yminus2.toml
@@ -0,0 +1,39 @@
+name = "rhel-9.3-microshift-4.{{ .Env.YMINUS2_MINOR_VERSION }}"
+description = "RHEL 9.3 with MicroShift from two minor versions back installed."
+version = "0.0.1"
+modules = []
+groups = []
+distro = "rhel-93"
+
+[[packages]]
+name = "microshift"
+version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*"
+
+[[packages]]
+name = "microshift-greenboot"
+version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*"
+
+[[packages]]
+name = "microshift-networking"
+version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*"
+
+[[packages]]
+name = "microshift-selinux"
+version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*"
+
+[[packages]]
+name = "microshift-test-agent"
+version = "*"
+
+[customizations.services]
+enabled = ["microshift", "microshift-test-agent"]
+
+[customizations.firewall]
+ports = ["22:tcp", "80:tcp", "443:tcp", "5353:udp", "6443:tcp", "30000-32767:tcp", "30000-32767:udp"]
+
+[customizations.firewall.services]
+enabled = ["mdns", "ssh", "http", "https"]
+
+[[customizations.firewall.zones]]
+name = "trusted"
+sources = ["10.42.0.0/16", "169.254.169.1"]
diff --git a/test/image-blueprints/layer3-periodic/group1/rhel94-crel-with-optionals.toml b/test/image-blueprints/layer3-periodic/group1/rhel94-crel-with-optionals.toml
new file mode 100644
index 0000000000..ef55ff2d44
--- /dev/null
+++ b/test/image-blueprints/layer3-periodic/group1/rhel94-crel-with-optionals.toml
@@ -0,0 +1,66 @@
+{{- if env.Getenv "CURRENT_RELEASE_VERSION" "" -}}
+{{- /*
+
+  We wrap this template in a test so that the body of the output is
+  empty when there is no "current" version release. The output file
+  must end up completely empty, so we need to remove whitespace from
+  around the first and last template instructions.
+
+*/ -}}
+
+name = "rhel-9.4-microshift-crel-optionals"
+description = "A RHEL 9.4 image with already built and released RPMs like EC, RC, or Z-stream release"
+version = "0.0.1"
+modules = []
+groups = []
+distro = "rhel-94"
+
+[[packages]]
+name = "microshift"
+version = "{{ .Env.CURRENT_RELEASE_VERSION }}"
+
+[[packages]]
+name = "microshift-greenboot"
+version = "{{ .Env.CURRENT_RELEASE_VERSION }}"
+
+[[packages]]
+name = "microshift-networking"
+version = "{{ .Env.CURRENT_RELEASE_VERSION }}"
+
+[[packages]]
+name = "microshift-selinux"
+version = "{{ .Env.CURRENT_RELEASE_VERSION }}"
+
+[[packages]]
+name = "microshift-olm"
+version = "{{ .Env.CURRENT_RELEASE_VERSION }}"
+
+[[packages]]
+name = "microshift-multus"
+version = "{{ .Env.CURRENT_RELEASE_VERSION }}"
+
+[[packages]]
+name = "microshift-test-agent"
+version = "*"
+
+[customizations.services]
+enabled = ["microshift", "microshift-test-agent"]
+
+[customizations.firewall]
+ports = [
+    "22:tcp",
+    "80:tcp",
+    "443:tcp",
+    "5353:udp",
+    "6443:tcp",
+    "30000-32767:tcp",
+    "30000-32767:udp",
+]
+
+[customizations.firewall.services]
+enabled = ["mdns", "ssh", "http", "https"]
+
+[[customizations.firewall.zones]]
+name = "trusted"
+sources = ["10.42.0.0/16", "169.254.169.1"]
+{{- end -}}
diff --git a/test/image-blueprints/layer3-periodic/group1/rhel94-source-with-optionals.toml b/test/image-blueprints/layer3-periodic/group1/rhel94-source-with-optionals.toml
new file mode 100644
index 0000000000..fd11ea3fdf
--- /dev/null
+++ b/test/image-blueprints/layer3-periodic/group1/rhel94-source-with-optionals.toml
@@ -0,0 +1,51 @@
+name = "rhel-9.4-microshift-source-optionals"
+description = "A RHEL 9.4 image with MicroShift and OLM built from source."
+version = "0.0.1"
+modules = []
+groups = []
+distro = "rhel-94"
+
+[[packages]]
+name = "microshift"
+version = "{{ .Env.SOURCE_VERSION }}"
+
+[[packages]]
+name = "microshift-greenboot"
+version = "{{ .Env.SOURCE_VERSION }}"
+
+[[packages]]
+name = "microshift-networking"
+version = "{{ .Env.SOURCE_VERSION }}"
+
+[[packages]]
+name = "microshift-selinux"
+version = "{{ .Env.SOURCE_VERSION }}"
+
+[[packages]]
+name = "microshift-olm"
+version = "{{ .Env.SOURCE_VERSION }}"
+
+[[packages]]
+name = "microshift-multus"
+version = "{{ .Env.SOURCE_VERSION }}"
+
+[[packages]]
+name = "microshift-test-agent"
+version = "*"
+
+[[packages]]
+name = "systemd-resolved"
+version = "*"
+
+[customizations.services]
+enabled = ["microshift", "microshift-test-agent"]
+
+[customizations.firewall]
+ports = ["22:tcp", "80:tcp", "443:tcp", "5353:udp", "6443:tcp", "30000-32767:tcp", "30000-32767:udp"]
+
+[customizations.firewall.services]
+enabled = ["mdns", "ssh", "http", "https"]
+
+[[customizations.firewall.zones]]
+name = "trusted"
+sources = ["10.42.0.0/16", "169.254.169.1"]
diff --git a/test/scenarios-periodics/cos9-src@rpm-standard1.sh b/test/scenarios-periodics/cos9-src@rpm-standard1.sh.pending_crel
similarity index 100%
rename from test/scenarios-periodics/cos9-src@rpm-standard1.sh
rename to test/scenarios-periodics/cos9-src@rpm-standard1.sh.pending_crel
diff --git a/test/scenarios-periodics/cos9-src@rpm-standard2.sh b/test/scenarios-periodics/cos9-src@rpm-standard2.sh.pending_crel
similarity index 100%
rename from test/scenarios-periodics/cos9-src@rpm-standard2.sh
rename to test/scenarios-periodics/cos9-src@rpm-standard2.sh.pending_crel
diff --git a/test/scenarios-periodics/el92-src@optional-upgrade.sh b/test/scenarios-periodics/el92-crel@el94-src@optional-upgrade.sh.pending_crel
similarity index 77%
rename from test/scenarios-periodics/el92-src@optional-upgrade.sh
rename to test/scenarios-periodics/el92-crel@el94-src@optional-upgrade.sh.pending_crel
index 4204ecd9ce..ea70e3f844 100644
--- a/test/scenarios-periodics/el92-src@optional-upgrade.sh
+++ b/test/scenarios-periodics/el92-crel@el94-src@optional-upgrade.sh.pending_crel
@@ -4,7 +4,7 @@
 
 scenario_create_vms() {
 	prepare_kickstart host1 kickstart.ks.template rhel-9.2-microshift-crel-optionals
-	launch_vm host1
+	launch_vm host1 rhel-9.2
 }
 
 scenario_remove_vms() {
@@ -13,6 +13,6 @@ scenario_remove_vms() {
 
 scenario_run_tests() {
 	run_tests host1 \
-		--variable "TARGET_REF:rhel-9.2-microshift-source-optionals" \
+		--variable "TARGET_REF:rhel-9.4-microshift-source-optionals" \
 		suites/upgrade/upgrade-multus.robot
 }
diff --git a/test/scenarios-periodics/el92-prel@el94-crel@upgrade-ok.sh.pending_crel b/test/scenarios-periodics/el92-prel@el94-crel@upgrade-ok.sh.pending_crel
new file mode 100644
index 0000000000..0ba0c5d0d2
--- /dev/null
+++ b/test/scenarios-periodics/el92-prel@el94-crel@upgrade-ok.sh.pending_crel
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Sourced from cleanup_scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+    # Determine the starting image based on the source tree current
+    # version, minus one.
+    local start_image
+    start_image="rhel-9.2-microshift-4.$(previous_minor_version)"
+
+    prepare_kickstart host1 kickstart.ks.template "${start_image}"
+	launch_vm host1 rhel-9.2
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    run_tests host1 \
+              --variable "TARGET_REF:rhel-9.4-microshift-crel" \
+              suites/upgrade/upgrade-successful.robot
+}
diff --git a/test/scenarios-periodics/el92-prel@upgrade-fails-and-rolls-back.sh b/test/scenarios-periodics/el92-prel@el94-src@upgrade-fails-and-rolls-back.sh
similarity index 87%
rename from test/scenarios-periodics/el92-prel@upgrade-fails-and-rolls-back.sh
rename to test/scenarios-periodics/el92-prel@el94-src@upgrade-fails-and-rolls-back.sh
index 9086db984a..680279a4fd 100644
--- a/test/scenarios-periodics/el92-prel@upgrade-fails-and-rolls-back.sh
+++ b/test/scenarios-periodics/el92-prel@el94-src@upgrade-fails-and-rolls-back.sh
@@ -4,7 +4,7 @@
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart.ks.template rhel-9.2-microshift-4."$(previous_minor_version)"
-    launch_vm host1
+    launch_vm host1 rhel-9.2
 }
 
 scenario_remove_vms() {
@@ -15,7 +15,7 @@ scenario_remove_vms() {
 # I.e. CI jobs testing release-4.14 will always compile the latest 4.14 code as the source_version.
 scenario_run_tests() {
     run_tests host1 \
-        --variable "FAILING_REF:rhel-9.2-microshift-source" \
+        --variable "FAILING_REF:rhel-9.4-microshift-source" \
         --variable "REASON:fail_greenboot" \
         suites/upgrade/upgrade-fails-and-rolls-back.robot
 }
diff --git a/test/scenarios-periodics/el92-prel@el94-src@upgrade-ok.sh b/test/scenarios-periodics/el92-prel@el94-src@upgrade-ok.sh
new file mode 100644
index 0000000000..fbb38dba1a
--- /dev/null
+++ b/test/scenarios-periodics/el92-prel@el94-src@upgrade-ok.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Sourced from cleanup_scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+    # Determine the starting image based on the source tree current
+    # version, minus one.
+    local start_image
+    start_image="rhel-9.2-microshift-4.$(previous_minor_version)"
+
+    prepare_kickstart host1 kickstart.ks.template "${start_image}"
+	launch_vm host1 rhel-9.2
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    run_tests host1 \
+              --variable "TARGET_REF:rhel-9.4-microshift-source" \
+              suites/upgrade/upgrade-successful.robot
+}
diff --git a/test/scenarios-periodics/el92-yminus2@el94-crel@upgrade-ok.sh.pending_crel b/test/scenarios-periodics/el92-yminus2@el94-crel@upgrade-ok.sh.pending_crel
new file mode 100644
index 0000000000..3e4e354cf4
--- /dev/null
+++ b/test/scenarios-periodics/el92-yminus2@el94-crel@upgrade-ok.sh.pending_crel
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Sourced from scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+    # Determine the starting image based on the source tree current
+    # version, minus one.
+    local start_image
+    start_image="rhel-9.2-microshift-4.$(yminus2_minor_version)"
+
+    prepare_kickstart host1 kickstart.ks.template "${start_image}"
+	launch_vm host1 rhel-9.2
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    run_tests host1 \
+              --variable "TARGET_REF:rhel-9.4-microshift-crel" \
+              suites/upgrade/upgrade-successful.robot
+}
diff --git a/test/scenarios-periodics/el93-crel@upgrade-to-el93-src.sh b/test/scenarios-periodics/el93-crel@upgrade-to-el93-src.sh
deleted file mode 100644
index 514d37f727..0000000000
--- a/test/scenarios-periodics/el93-crel@upgrade-to-el93-src.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Sourced from cleanup_scenario.sh and uses functions defined there.
-
-start_commit=rhel-9.3-microshift-crel
-target_commit=rhel-9.3-microshift-source
-
-scenario_create_vms() {
-	if ! does_commit_exist "${start_commit}"; then
-		echo "Commit '${start_commit}' not found in ostree repo - skipping test"
-		return 0
-	fi
-	prepare_kickstart host1 kickstart.ks.template "${start_commit}"
-	launch_vm host1
-}
-
-scenario_remove_vms() {
-	remove_vm host1
-}
-
-scenario_run_tests() {
-	if ! does_commit_exist "${start_commit}"; then
-		echo "Commit '${start_commit}' not found in ostree repo - skipping test"
-		return 0
-	fi
-	run_tests host1 \
-		--variable "TARGET_REF:${target_commit}" \
-		suites/upgrade/upgrade-successful.robot
-}
diff --git a/test/scenarios-periodics/el93-prel@el94-crel@upgrade-ok.sh.pending_crel b/test/scenarios-periodics/el93-prel@el94-crel@upgrade-ok.sh.pending_crel
new file mode 100644
index 0000000000..c8a14538bc
--- /dev/null
+++ b/test/scenarios-periodics/el93-prel@el94-crel@upgrade-ok.sh.pending_crel
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Sourced from cleanup_scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+    # Determine the starting image based on the source tree current
+    # version, minus one.
+    local start_image
+    start_image="rhel-9.3-microshift-4.$(previous_minor_version)"
+
+    prepare_kickstart host1 kickstart.ks.template "${start_image}"
+    launch_vm host1 rhel-9.3
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    run_tests host1 \
+              --variable "TARGET_REF:rhel-9.4-microshift-crel" \
+              suites/upgrade/upgrade-successful.robot
+}
diff --git a/test/scenarios-periodics/el93-prel@el94-src@upgrade-ok.sh b/test/scenarios-periodics/el93-prel@el94-src@upgrade-ok.sh
new file mode 100644
index 0000000000..03c14a6318
--- /dev/null
+++ b/test/scenarios-periodics/el93-prel@el94-src@upgrade-ok.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Sourced from cleanup_scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+    # Determine the starting image based on the source tree current
+    # version, minus one.
+    local start_image
+    start_image="rhel-9.3-microshift-4.$(previous_minor_version)"
+
+    prepare_kickstart host1 kickstart.ks.template "${start_image}"
+    launch_vm host1 rhel-9.3
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    run_tests host1 \
+              --variable "TARGET_REF:rhel-9.4-microshift-source" \
+              suites/upgrade/upgrade-successful.robot
+}
diff --git a/test/scenarios-periodics/el93-src@standard-suite1.sh b/test/scenarios-periodics/el93-src@standard-suite1.sh
deleted file mode 100644
index 3a41e41082..0000000000
--- a/test/scenarios-periodics/el93-src@standard-suite1.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-scenario_create_vms() {
-	prepare_kickstart host1 kickstart.ks.template rhel-9.3-microshift-source
-	launch_vm host1 rhel-9.3
-}
-
-scenario_remove_vms() {
-	remove_vm host1
-}
-
-scenario_run_tests() {
-	run_tests host1 suites/standard1/
-}
diff --git a/test/scenarios-periodics/el93-src@standard-suite2.sh b/test/scenarios-periodics/el93-src@standard-suite2.sh
deleted file mode 100644
index f468f5327b..0000000000
--- a/test/scenarios-periodics/el93-src@standard-suite2.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-scenario_create_vms() {
-	prepare_kickstart host1 kickstart.ks.template rhel-9.3-microshift-source
-	launch_vm host1 rhel-9.3
-}
-
-scenario_remove_vms() {
-	remove_vm host1
-}
-
-scenario_run_tests() {
-	run_tests host1 suites/standard2/
-}
diff --git a/test/scenarios-periodics/el93-src@upgrade-from-el92-prel.sh b/test/scenarios-periodics/el93-src@upgrade-from-el92-prel.sh
deleted file mode 100644
index b76b2e08ac..0000000000
--- a/test/scenarios-periodics/el93-src@upgrade-from-el92-prel.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-# Scenario tests upgrade from RHEL9.2 to RHEL9.3 (including MicroShift).
-
-start_commit="rhel-9.2-microshift-4.$(previous_minor_version)"
-target_commit="rhel-9.3-microshift-source"
-
-scenario_create_vms() {
-	prepare_kickstart host1 kickstart.ks.template "${start_commit}"
-	launch_vm host1 rhel-9.2
-}
-
-scenario_remove_vms() {
-	remove_vm host1
-}
-
-scenario_run_tests() {
-	run_tests host1 \
-		--variable "TARGET_REF:${target_commit}" \
-		suites/upgrade/upgrade-successful.robot
-}
diff --git a/test/scenarios-periodics/el93-src@upgrade-from-el92-src.sh b/test/scenarios-periodics/el93-src@upgrade-from-el92-src.sh
deleted file mode 100644
index 4418173ab2..0000000000
--- a/test/scenarios-periodics/el93-src@upgrade-from-el92-src.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-# Scenario tests upgrade from RHEL9.2 to RHEL9.3 without upgrading MicroShift.
-
-start_commit=rhel-9.2-microshift-source
-target_commit="rhel-9.3-microshift-source"
-
-scenario_create_vms() {
-	prepare_kickstart host1 kickstart.ks.template "${start_commit}"
-	launch_vm host1 rhel-9.2
-}
-
-scenario_remove_vms() {
-	remove_vm host1
-}
-
-scenario_run_tests() {
-	run_tests host1 \
-		--variable "TARGET_REF:${target_commit}" \
-		suites/upgrade/upgrade-successful.robot
-}
diff --git a/test/scenarios-periodics/el93-yminus2@el94-crel@upgrade-ok.sh.pending_crel b/test/scenarios-periodics/el93-yminus2@el94-crel@upgrade-ok.sh.pending_crel
new file mode 100644
index 0000000000..6eaced70c5
--- /dev/null
+++ b/test/scenarios-periodics/el93-yminus2@el94-crel@upgrade-ok.sh.pending_crel
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Sourced from scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+    # Determine the starting image based on the source tree current
+    # version, minus one.
+    local start_image
+    start_image="rhel-9.3-microshift-4.$(yminus2_minor_version)"
+
+    prepare_kickstart host1 kickstart.ks.template "${start_image}"
+    launch_vm host1 rhel-9.3
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    run_tests host1 \
+              --variable "TARGET_REF:rhel-9.4-microshift-crel" \
+              suites/upgrade/upgrade-successful.robot
+}
diff --git a/test/scenarios-periodics/el93-yminus2@el94-src@upgrade-ok.sh b/test/scenarios-periodics/el93-yminus2@el94-src@upgrade-ok.sh
new file mode 100644
index 0000000000..fd77377b01
--- /dev/null
+++ b/test/scenarios-periodics/el93-yminus2@el94-src@upgrade-ok.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Sourced from scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+    # Determine the starting image based on the source tree current
+    # version, minus one.
+    local start_image
+    start_image="rhel-9.3-microshift-4.$(yminus2_minor_version)"
+
+    prepare_kickstart host1 kickstart.ks.template "${start_image}"
+    launch_vm host1 rhel-9.3
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    run_tests host1 \
+              --variable "TARGET_REF:rhel-9.4-microshift-source" \
+              suites/upgrade/upgrade-successful.robot
+}
diff --git a/test/scenarios-periodics/el94-crel@el94-src@optional-upgrade.sh.pending_crel b/test/scenarios-periodics/el94-crel@el94-src@optional-upgrade.sh.pending_crel
new file mode 100644
index 0000000000..bcbc6b02ab
--- /dev/null
+++ b/test/scenarios-periodics/el94-crel@el94-src@optional-upgrade.sh.pending_crel
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Sourced from scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+	prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-crel-optionals
+	launch_vm host1 rhel-9.4
+}
+
+scenario_remove_vms() {
+	remove_vm host1
+}
+
+scenario_run_tests() {
+	run_tests host1 \
+		--variable "TARGET_REF:rhel-9.4-microshift-source-optionals" \
+		suites/upgrade/upgrade-multus.robot
+}
diff --git a/test/scenarios-periodics/el92-crel@upgrade-fails.sh b/test/scenarios-periodics/el94-crel@el94-src@upgrade-fails.sh.pending_crel
similarity index 81%
rename from test/scenarios-periodics/el92-crel@upgrade-fails.sh
rename to test/scenarios-periodics/el94-crel@el94-src@upgrade-fails.sh.pending_crel
index fbbec6bff4..0ce88ad067 100644
--- a/test/scenarios-periodics/el92-crel@upgrade-fails.sh
+++ b/test/scenarios-periodics/el94-crel@el94-src@upgrade-fails.sh.pending_crel
@@ -2,14 +2,14 @@
 
 # Sourced from scenario.sh and uses functions defined there.
 
-start_commit=rhel-9.2-microshift-crel
+start_commit=rhel-9.4-microshift-crel
 
 scenario_create_vms() {
     if ! does_commit_exist "${start_commit}"; then
         echo "Commit '${start_commit}' not found in ostree repo - skipping test"
         return 0
     fi
-    prepare_kickstart host1 kickstart.ks.template rhel-9.2-microshift-crel
+    prepare_kickstart host1 kickstart.ks.template "${start_commit}"
     launch_vm host1
 }
 
@@ -27,7 +27,7 @@ scenario_run_tests() {
         return 0
     fi
     run_tests host1 \
-        --variable "FAILING_REF:rhel-9.2-microshift-source" \
+        --variable "FAILING_REF:rhel-9.4-microshift-source" \
         --variable "REASON:fail_greenboot" \
         suites/upgrade/upgrade-fails-and-rolls-back.robot
 }
diff --git a/test/scenarios-periodics/el94-crel@el94-src@upgrade-ok.sh.pending_crel b/test/scenarios-periodics/el94-crel@el94-src@upgrade-ok.sh.pending_crel
new file mode 100644
index 0000000000..5a9fff1c1f
--- /dev/null
+++ b/test/scenarios-periodics/el94-crel@el94-src@upgrade-ok.sh.pending_crel
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Sourced from cleanup_scenario.sh and uses functions defined there.
+
+scenario_create_vms() {
+    # Determine the starting image based on the source tree current
+    # version, minus one.
+    local start_image
+    start_image="rhel-9.4-microshift-crel"
+
+    prepare_kickstart host1 kickstart.ks.template "${start_image}"
+    launch_vm host1 rhel-9.4
+}
+
+scenario_remove_vms() {
+    remove_vm host1
+}
+
+scenario_run_tests() {
+    run_tests host1 \
+              --variable "TARGET_REF:rhel-9.4-microshift-source" \
+              suites/upgrade/upgrade-successful.robot
+}
diff --git a/test/scenarios-periodics/el92-src@cncf-conformance.sh b/test/scenarios-periodics/el94-src@cncf-conformance.sh
similarity index 97%
rename from test/scenarios-periodics/el92-src@cncf-conformance.sh
rename to test/scenarios-periodics/el94-src@cncf-conformance.sh
index 165ce5d34c..dab343ab94 100644
--- a/test/scenarios-periodics/el92-src@cncf-conformance.sh
+++ b/test/scenarios-periodics/el94-src@cncf-conformance.sh
@@ -156,10 +156,10 @@ run_sonobuoy() {
 }
 
 scenario_create_vms() {
-    prepare_kickstart host1 kickstart.ks.template rhel-9.2-microshift-source
-    prepare_kickstart host2 kickstart.ks.template rhel-9.2-microshift-source
-    launch_vm host1
-    launch_vm host2
+    prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source
+    prepare_kickstart host2 kickstart.ks.template rhel-9.4-microshift-source
+    launch_vm host1 rhel-9.4
+    launch_vm host2 rhel-9.4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-periodics/el92-src@greenboot.sh b/test/scenarios-periodics/el94-src@greenboot.sh
similarity index 70%
rename from test/scenarios-periodics/el92-src@greenboot.sh
rename to test/scenarios-periodics/el94-src@greenboot.sh
index 28479c8423..3f15bd1fe4 100644
--- a/test/scenarios-periodics/el92-src@greenboot.sh
+++ b/test/scenarios-periodics/el94-src@greenboot.sh
@@ -3,8 +3,8 @@
 # Sourced from scenario.sh and uses functions defined there.
 
 scenario_create_vms() {
-    prepare_kickstart host1 kickstart.ks.template rhel-9.2-microshift-source
-    launch_vm host1
+    prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source
+    launch_vm host1 rhel-9.4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-periodics/el94-src@isolated-net.sh b/test/scenarios-periodics/el94-src@isolated-net.sh
index 99d68b20be..83af2918f7 100644
--- a/test/scenarios-periodics/el94-src@isolated-net.sh
+++ b/test/scenarios-periodics/el94-src@isolated-net.sh
@@ -10,7 +10,7 @@ WEB_SERVER_URL="http://${VM_BRIDGE_IP}:${WEB_SERVER_PORT}"
 scenario_create_vms() {
     prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source-isolated
     # Use the isolated network when creating a VM
-    launch_vm host1 "" "${VM_ISOLATED_NETWORK}"
+    launch_vm host1 "rhel-9.4" "${VM_ISOLATED_NETWORK}"
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-periodics/el92-src@manual-rollback.sh b/test/scenarios-periodics/el94-src@manual-rollback.sh
similarity index 61%
rename from test/scenarios-periodics/el92-src@manual-rollback.sh
rename to test/scenarios-periodics/el94-src@manual-rollback.sh
index 5ca368326f..ce042648fc 100644
--- a/test/scenarios-periodics/el92-src@manual-rollback.sh
+++ b/test/scenarios-periodics/el94-src@manual-rollback.sh
@@ -3,8 +3,8 @@
 # Sourced from scenario.sh and uses functions defined there.
 
 scenario_create_vms() {
-    prepare_kickstart host1 kickstart.ks.template rhel-9.2-microshift-source
-    launch_vm host1
+    prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source
+    launch_vm host1 rhel-9.4
 }
 
 scenario_remove_vms() {
@@ -13,6 +13,6 @@ scenario_remove_vms() {
 
 scenario_run_tests() {
     run_tests host1 \
-        --variable "UPGRADE_REF:rhel-9.2-microshift-source-aux" \
+        --variable "UPGRADE_REF:rhel-9.4-microshift-source-aux" \
         suites/upgrade/rollback-manual.robot
 }
diff --git a/test/scenarios-periodics/el92-src@optional.sh b/test/scenarios-periodics/el94-src@optional.sh
similarity index 81%
rename from test/scenarios-periodics/el92-src@optional.sh
rename to test/scenarios-periodics/el94-src@optional.sh
index b7f615b3a6..45d047e788 100644
--- a/test/scenarios-periodics/el92-src@optional.sh
+++ b/test/scenarios-periodics/el94-src@optional.sh
@@ -8,9 +8,9 @@ VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")"
 WEB_SERVER_URL="http://${VM_BRIDGE_IP}:${WEB_SERVER_PORT}"
 
 scenario_create_vms() {
-    prepare_kickstart host1 kickstart.ks.template rhel-9.2-microshift-source-optionals
+    prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source-optionals
     # Two nics - one for macvlan, another for ipvlan (they cannot enslave the same interface)
-    launch_vm host1 "" "${VM_MULTUS_NETWORK}" "" "" "" 2
+    launch_vm host1 "rhel-9.4" "${VM_MULTUS_NETWORK}" "" "" "" 2
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-periodics/el92-src@osconfig.sh b/test/scenarios-periodics/el94-src@osconfig.sh
similarity index 78%
rename from test/scenarios-periodics/el92-src@osconfig.sh
rename to test/scenarios-periodics/el94-src@osconfig.sh
index 125023cfd7..0299b83c25 100644
--- a/test/scenarios-periodics/el92-src@osconfig.sh
+++ b/test/scenarios-periodics/el94-src@osconfig.sh
@@ -7,8 +7,8 @@
 TEST_EXECUTION_TIMEOUT="1.5h"
 
 scenario_create_vms() {
-    prepare_kickstart host1 kickstart.ks.template rhel-9.2-microshift-source
-    launch_vm host1
+    prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source
+    launch_vm host1 rhel-9.4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-periodics/el92-src@upgrade-fails-cannot-backup.sh b/test/scenarios-periodics/el94-src@upgrade-fails-cannot-backup.sh
similarity index 72%
rename from test/scenarios-periodics/el92-src@upgrade-fails-cannot-backup.sh
rename to test/scenarios-periodics/el94-src@upgrade-fails-cannot-backup.sh
index bda7f8e3ca..4cba2f0ddb 100644
--- a/test/scenarios-periodics/el92-src@upgrade-fails-cannot-backup.sh
+++ b/test/scenarios-periodics/el94-src@upgrade-fails-cannot-backup.sh
@@ -3,7 +3,7 @@
 # Sourced from scenario.sh and uses functions defined there.
 
 scenario_create_vms() {
-    prepare_kickstart host1 kickstart.ks.template rhel-9.2-microshift-source
+    prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source
     launch_vm host1
 }
 
@@ -13,7 +13,7 @@ scenario_remove_vms() {
 
 scenario_run_tests() {
     run_tests host1 \
-        --variable "FAILING_REF:rhel-9.2-microshift-source-aux" \
+        --variable "FAILING_REF:rhel-9.4-microshift-source-aux" \
         --variable "REASON:prevent_backup" \
         suites/upgrade/upgrade-fails-and-rolls-back.robot
 }
diff --git a/test/scenarios/el93-prel@el94-src@upgrade-ok.sh b/test/scenarios/el93-prel@el94-src@upgrade-ok.sh
index 00521b57a1..03c14a6318 100644
--- a/test/scenarios/el93-prel@el94-src@upgrade-ok.sh
+++ b/test/scenarios/el93-prel@el94-src@upgrade-ok.sh
@@ -9,7 +9,7 @@ scenario_create_vms() {
     start_image="rhel-9.3-microshift-4.$(previous_minor_version)"
 
     prepare_kickstart host1 kickstart.ks.template "${start_image}"
-    launch_vm host1
+    launch_vm host1 rhel-9.3
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios/el94-base@el94-src@upgrade-ok.sh b/test/scenarios/el94-base@el94-src@upgrade-ok.sh
index c3c0b858ab..a177f6e2a6 100644
--- a/test/scenarios/el94-base@el94-src@upgrade-ok.sh
+++ b/test/scenarios/el94-base@el94-src@upgrade-ok.sh
@@ -4,7 +4,7 @@
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source-base
-    launch_vm host1
+    launch_vm host1 rhel-9.4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios/el94-crel@el94-src@upgrade-ok.sh b/test/scenarios/el94-crel@el94-src@upgrade-ok.sh.pending_crel
similarity index 96%
rename from test/scenarios/el94-crel@el94-src@upgrade-ok.sh
rename to test/scenarios/el94-crel@el94-src@upgrade-ok.sh.pending_crel
index 93da0239c2..86a6c9d242 100644
--- a/test/scenarios/el94-crel@el94-src@upgrade-ok.sh
+++ b/test/scenarios/el94-crel@el94-src@upgrade-ok.sh.pending_crel
@@ -10,7 +10,7 @@ scenario_create_vms() {
         return 0
     fi
     prepare_kickstart host1 kickstart.ks.template "${start_commit}"
-    launch_vm host1
+    launch_vm host1 rhel-9.4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios/el94-src@backup-and-restore-on-reboot.sh b/test/scenarios/el94-src@backup-and-restore-on-reboot.sh
index 0ae44e7fff..d0c6f8a011 100644
--- a/test/scenarios/el94-src@backup-and-restore-on-reboot.sh
+++ b/test/scenarios/el94-src@backup-and-restore-on-reboot.sh
@@ -4,7 +4,7 @@
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source
-    launch_vm host1
+    launch_vm host1 rhel-9.4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios/el94-src@backups.sh b/test/scenarios/el94-src@backups.sh
index 9056d8fbd3..9f557fb01c 100644
--- a/test/scenarios/el94-src@backups.sh
+++ b/test/scenarios/el94-src@backups.sh
@@ -4,7 +4,7 @@
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source
-    launch_vm host1
+    launch_vm host1 rhel-9.4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios/el94-src@downgrade-block.sh b/test/scenarios/el94-src@downgrade-block.sh
index 40b59453a6..83566c7553 100644
--- a/test/scenarios/el94-src@downgrade-block.sh
+++ b/test/scenarios/el94-src@downgrade-block.sh
@@ -4,7 +4,7 @@
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source-fake-next-minor
-    launch_vm host1
+    launch_vm host1 rhel-9.4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios/el94-src@log-scan.sh b/test/scenarios/el94-src@log-scan.sh
index 31813d89ae..ad87b79ed3 100644
--- a/test/scenarios/el94-src@log-scan.sh
+++ b/test/scenarios/el94-src@log-scan.sh
@@ -10,7 +10,7 @@ export TEST_RANDOMIZATION=none
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source
-    launch_vm host1
+    launch_vm host1 rhel-9.4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios/el94-src@multi-nic.sh b/test/scenarios/el94-src@multi-nic.sh
index 9748893ca0..821b2e0b25 100644
--- a/test/scenarios/el94-src@multi-nic.sh
+++ b/test/scenarios/el94-src@multi-nic.sh
@@ -5,7 +5,7 @@
 scenario_create_vms() {
     prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source
     # Create a VM with 2 NICs
-    launch_vm host1 "" "" "" "" "" 2
+    launch_vm host1 "rhel-9.4" "" "" "" "" 2
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios/el94-src@standard-suite1.sh b/test/scenarios/el94-src@standard-suite1.sh
index 9bc4e02657..0b116b6b34 100644
--- a/test/scenarios/el94-src@standard-suite1.sh
+++ b/test/scenarios/el94-src@standard-suite1.sh
@@ -4,7 +4,7 @@
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source
-    launch_vm host1
+    launch_vm host1 rhel-9.4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios/el94-src@storage.sh b/test/scenarios/el94-src@storage.sh
index f788d0de91..cae5339255 100644
--- a/test/scenarios/el94-src@storage.sh
+++ b/test/scenarios/el94-src@storage.sh
@@ -4,7 +4,7 @@
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-source
-    launch_vm host1
+    launch_vm host1 rhel-9.4
 }
 
 scenario_remove_vms() {