diff --git a/test/image-blueprints-bootc/upstream/group1/cos10-test-agent.containerfile b/test/image-blueprints-bootc/upstream/group1/cos10-test-agent.containerfile
deleted file mode 100644
index 982ba1bf45..0000000000
--- a/test/image-blueprints-bootc/upstream/group1/cos10-test-agent.containerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM quay.io/centos-bootc/centos-bootc:stream10
-
-# Build arguments
-ARG USHIFT_RPM_REPO_NAME=microshift-local
-ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
-
-# Configure the RPM repositories (no EUS on CentOS)
-COPY --chmod=755 ./bootc-images/rpm-repo-config.sh /tmp/rpm-repo-config.sh
-RUN /tmp/rpm-repo-config.sh && rm -f /tmp/rpm-repo-config.sh
-
-# Copy the MicroShift repository contents
-COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH
-
-# Copy repository configuration
-COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo /etc/yum.repos.d/
-
-# Install the test agent and cleanup
-RUN dnf install -y microshift-test-agent && \
-    systemctl enable microshift-test-agent && \
-    rm -vf /etc/yum.repos.d/microshift-*.repo && \
-    rm -rvf $USHIFT_RPM_REPO_PATH && \
-    dnf clean all
diff --git a/test/image-blueprints-bootc/upstream/group1/cos9-test-agent.containerfile b/test/image-blueprints-bootc/upstream/group1/cos9-test-agent.containerfile
deleted file mode 100644
index 58efa66116..0000000000
--- a/test/image-blueprints-bootc/upstream/group1/cos9-test-agent.containerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM quay.io/centos-bootc/centos-bootc:stream9
-
-# Build arguments
-ARG USHIFT_RPM_REPO_NAME=microshift-local
-ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
-
-# Configure the RPM repositories (no EUS on CentOS)
-COPY --chmod=755 ./bootc-images/rpm-repo-config.sh /tmp/rpm-repo-config.sh
-RUN /tmp/rpm-repo-config.sh && rm -f /tmp/rpm-repo-config.sh
-
-# Copy the MicroShift repository contents
-COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH
-
-# Copy repository configuration
-COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo /etc/yum.repos.d/
-
-# Install the test agent and cleanup
-RUN dnf install -y microshift-test-agent && \
-    systemctl enable microshift-test-agent && \
-    rm -vf /etc/yum.repos.d/microshift-*.repo && \
-    rm -rvf $USHIFT_RPM_REPO_PATH && \
-    dnf clean all
diff --git a/test/image-blueprints-bootc/upstream/group2/centos10-bootc.image-bootc b/test/image-blueprints-bootc/upstream/group2/centos10-bootc.image-bootc
deleted file mode 100644
index c942b6135d..0000000000
--- a/test/image-blueprints-bootc/upstream/group2/centos10-bootc.image-bootc
+++ /dev/null
@@ -1 +0,0 @@
-quay.io/centos-bootc/centos-bootc:stream10
\ No newline at end of file
diff --git a/test/image-blueprints-bootc/upstream/group2/centos9-bootc.image-bootc b/test/image-blueprints-bootc/upstream/group2/centos9-bootc.image-bootc
deleted file mode 100644
index 5099ec7dfc..0000000000
--- a/test/image-blueprints-bootc/upstream/group2/centos9-bootc.image-bootc
+++ /dev/null
@@ -1 +0,0 @@
-quay.io/centos-bootc/centos-bootc:stream9
\ No newline at end of file
diff --git a/test/image-blueprints-bootc/upstream/group2/cos10-bootc-source.containerfile b/test/image-blueprints-bootc/upstream/group2/cos10-bootc-source.containerfile
deleted file mode 100644
index 7d47fb2347..0000000000
--- a/test/image-blueprints-bootc/upstream/group2/cos10-bootc-source.containerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-FROM localhost/cos10-test-agent:latest
-
-# Build arguments
-ARG USHIFT_RPM_REPO_NAME=microshift-local
-ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
-
-# Copy the MicroShift repository contents
-COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH
-
-# Copy repository configuration
-COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-centos10-nfv.repo ./bootc-images/microshift-rhocp-y.repo \
-    /etc/yum.repos.d/
-
-# Print repository configuration contents.
-# Install MicroShift and cleanup.
-RUN dnf repoinfo --enabled && \
-    dnf install -y firewalld systemd-resolved \
-        {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") -}}
-        "{{ . }}-{{ env.Getenv "SOURCE_VERSION" }}" \
-        {{ end -}}
-        && \
-    systemctl enable microshift && \
-    rm -vf /etc/yum.repos.d/microshift-*.repo && \
-    rm -rvf $USHIFT_RPM_REPO_PATH && \
-    dnf clean all
-
-# Configure firewall
-RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
-    firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \
-    firewall-offline-cmd --zone=trusted --add-source=169.254.169.1 && \
-    firewall-offline-cmd --zone=trusted --add-source=fd01::/48 && \
-    firewall-offline-cmd --zone=public --add-port=80/tcp && \
-    firewall-offline-cmd --zone=public --add-port=443/tcp && \
-    firewall-offline-cmd --zone=public --add-port=5353/udp && \
-    firewall-offline-cmd --zone=public --add-port=6443/tcp && \
-    firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \
-    firewall-offline-cmd --zone=public --add-port=30000-32767/udp
diff --git a/test/image-blueprints-bootc/upstream/group2/cos9-bootc-source.containerfile b/test/image-blueprints-bootc/upstream/group2/cos9-bootc-source.containerfile
deleted file mode 100644
index cd6ab4cd8b..0000000000
--- a/test/image-blueprints-bootc/upstream/group2/cos9-bootc-source.containerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-FROM localhost/cos9-test-agent:latest
-
-# Build arguments
-ARG USHIFT_RPM_REPO_NAME=microshift-local
-ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
-
-# Copy the MicroShift repository contents
-COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH
-
-# Copy repository configuration
-COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-centos9-nfv.repo ./bootc-images/microshift-rhocp-y.repo \
-    /etc/yum.repos.d/
-
-# Print repository configuration contents.
-# Install MicroShift and cleanup.
-RUN dnf repoinfo --enabled && \
-    dnf install -y firewalld systemd-resolved \
-        {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") -}}
-        "{{ . }}-{{ env.Getenv "SOURCE_VERSION" }}" \
-        {{ end -}}
-        && \
-    systemctl enable microshift && \
-    rm -vf /etc/yum.repos.d/microshift-*.repo && \
-    rm -rvf $USHIFT_RPM_REPO_PATH && \
-    dnf clean all
-
-# Configure firewall
-RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
-    firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \
-    firewall-offline-cmd --zone=trusted --add-source=169.254.169.1 && \
-    firewall-offline-cmd --zone=trusted --add-source=fd01::/48 && \
-    firewall-offline-cmd --zone=public --add-port=80/tcp && \
-    firewall-offline-cmd --zone=public --add-port=443/tcp && \
-    firewall-offline-cmd --zone=public --add-port=5353/udp && \
-    firewall-offline-cmd --zone=public --add-port=6443/tcp && \
-    firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \
-    firewall-offline-cmd --zone=public --add-port=30000-32767/udp
diff --git a/test/image-blueprints-bootc/upstream/group3/cos10-bootc-source-isolated.containerfile b/test/image-blueprints-bootc/upstream/group3/cos10-bootc-source-isolated.containerfile
deleted file mode 100644
index fc3fce6ab2..0000000000
--- a/test/image-blueprints-bootc/upstream/group3/cos10-bootc-source-isolated.containerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM localhost/cos10-bootc-source:latest
-
-# 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 directory.
-# 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/upstream/group3/cos10-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/upstream/group3/cos10-bootc-source-optionals.containerfile
deleted file mode 100644
index 6a86a1342a..0000000000
--- a/test/image-blueprints-bootc/upstream/group3/cos10-bootc-source-optionals.containerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM localhost/cos10-bootc-source:latest
-
-# Build arguments
-ARG USHIFT_RPM_REPO_NAME=microshift-local
-ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
-
-# Copy the MicroShift repository contents
-COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH
-
-# Copy repository configuration
-COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-centos10-nfv.repo ./bootc-images/microshift-rhocp-y.repo \
-    /etc/yum.repos.d/
-
-# Print repository configuration contents.
-# Install MicroShift optional packages and cleanup.
-RUN dnf repoinfo --enabled && \
-    dnf install -y \
-        {{ range (env.Getenv "MICROSHIFT_OPTIONAL_RPMS" | strings.Split " ") -}}
-        "{{ . }}-{{ env.Getenv "SOURCE_VERSION" }}" \
-        {{ end -}}
-        {{ if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) -}}
-        {{ range (env.Getenv "MICROSHIFT_X86_64_RPMS" | strings.Split " ") -}}
-        "{{ . }}-{{ env.Getenv "SOURCE_VERSION" }}" \
-        {{ end -}}
-        {{ end -}}
-        && \
-    rm -vf /etc/yum.repos.d/microshift-*.repo && \
-    rm -rvf $USHIFT_RPM_REPO_PATH && \
-    dnf clean all
-
-# Prepare system for testing Generic Device Plugin
-COPY --chmod=755 ./bootc-images/build-serialsim.sh /tmp/build-serialsim.sh
-RUN /tmp/build-serialsim.sh && rm -f /tmp/build-serialsim.sh
diff --git a/test/image-blueprints-bootc/upstream/group3/cos9-bootc-source-isolated.containerfile b/test/image-blueprints-bootc/upstream/group3/cos9-bootc-source-isolated.containerfile
deleted file mode 100644
index a5553d0e83..0000000000
--- a/test/image-blueprints-bootc/upstream/group3/cos9-bootc-source-isolated.containerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM localhost/cos9-bootc-source:latest
-
-# 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 directory.
-# 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/upstream/group3/cos9-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/upstream/group3/cos9-bootc-source-optionals.containerfile
deleted file mode 100644
index 10735aa4c4..0000000000
--- a/test/image-blueprints-bootc/upstream/group3/cos9-bootc-source-optionals.containerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM localhost/cos9-bootc-source:latest
-
-# Build arguments
-ARG USHIFT_RPM_REPO_NAME=microshift-local
-ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
-
-# Copy the MicroShift repository contents
-COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH
-
-# Copy repository configuration
-COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-centos9-nfv.repo ./bootc-images/microshift-rhocp-y.repo \
-    /etc/yum.repos.d/
-
-# Print repository configuration contents.
-# Install MicroShift optional packages and cleanup.
-RUN dnf repoinfo --enabled && \
-    dnf install -y \
-        {{ range (env.Getenv "MICROSHIFT_OPTIONAL_RPMS" | strings.Split " ") -}}
-        "{{ . }}-{{ env.Getenv "SOURCE_VERSION" }}" \
-        {{ end -}}
-        {{ if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) -}}
-        {{ range (env.Getenv "MICROSHIFT_X86_64_RPMS" | strings.Split " ") -}}
-        "{{ . }}-{{ env.Getenv "SOURCE_VERSION" }}" \
-        {{ end -}}
-        {{ end -}}
-        && \
-    rm -vf /etc/yum.repos.d/microshift-*.repo && \
-    rm -rvf $USHIFT_RPM_REPO_PATH && \
-    dnf clean all
-
-# Prepare system for testing Generic Device Plugin
-COPY --chmod=755 ./bootc-images/build-serialsim.sh /tmp/build-serialsim.sh
-RUN /tmp/build-serialsim.sh && rm -f /tmp/build-serialsim.sh
diff --git a/test/scenarios-bootc/el10/periodics/el102-src@optional.sh b/test/scenarios-bootc/el10/periodics/el102-src@optional.sh
index 9d609a1071..77ad47d9a9 100644
--- a/test/scenarios-bootc/el10/periodics/el102-src@optional.sh
+++ b/test/scenarios-bootc/el10/periodics/el102-src@optional.sh
@@ -2,6 +2,15 @@
 
 # Sourced from scenario.sh and uses functions defined there.
 
+# Each optional suite restarts MicroShift with its own kustomizePaths config,
+# adding ~10 minutes of restart overhead to the total execution time.
+# shellcheck disable=SC2034  # used elsewhere
+TEST_EXECUTION_TIMEOUT=60m
+
+# shellcheck disable=SC2034  # used elsewhere
+# Increase greenboot timeout for optional packages (more services to start)
+GREENBOOT_TIMEOUT=1200
+
 # Redefine network-related settings to use the dedicated network bridge
 VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")"
 # shellcheck disable=SC2034  # used elsewhere
@@ -15,7 +24,7 @@ scenario_create_vms() {
     fi
     LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template rhel102-bootc-source-optionals
     # Three nics - one for sriov, one for macvlan, another for ipvlan (they cannot enslave the same interface)
-    launch_vm rhel102-bootc --network "${networks}" --vm_disksize 25
+    launch_vm rhel102-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4
 }
 
 scenario_remove_vms() {
diff --git a/test/scenarios-bootc/el10/releases/el102-lrel@optional.sh b/test/scenarios-bootc/el10/releases/el102-lrel@optional.sh
index a17d90753d..9a62cfccff 100644
--- a/test/scenarios-bootc/el10/releases/el102-lrel@optional.sh
+++ b/test/scenarios-bootc/el10/releases/el102-lrel@optional.sh
@@ -2,6 +2,15 @@
 
 # Sourced from scenario.sh and uses functions defined there.
 
+# Each optional suite restarts MicroShift with its own kustomizePaths config,
+# adding ~10 minutes of restart overhead to the total execution time.
+# shellcheck disable=SC2034  # used elsewhere
+TEST_EXECUTION_TIMEOUT=60m
+
+# shellcheck disable=SC2034  # used elsewhere
+# Increase greenboot timeout for optional packages (more services to start)
+GREENBOOT_TIMEOUT=1200
+
 # Redefine network-related settings to use the dedicated network bridge
 VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")"
 # shellcheck disable=SC2034  # used elsewhere
diff --git a/test/scenarios-bootc/el9/presubmits/el98-src@optional.sh b/test/scenarios-bootc/el9/periodics/el98-src@optional.sh
similarity index 100%
rename from test/scenarios-bootc/el9/presubmits/el98-src@optional.sh
rename to test/scenarios-bootc/el9/periodics/el98-src@optional.sh
diff --git a/test/scenarios-bootc/el9/releases/el98-lrel@optional.sh b/test/scenarios-bootc/el9/releases/el98-lrel@optional.sh
index 9f5c35972f..a4d3782b8e 100644
--- a/test/scenarios-bootc/el9/releases/el98-lrel@optional.sh
+++ b/test/scenarios-bootc/el9/releases/el98-lrel@optional.sh
@@ -2,6 +2,15 @@
 
 # Sourced from scenario.sh and uses functions defined there.
 
+# Each optional suite restarts MicroShift with its own kustomizePaths config,
+# adding ~10 minutes of restart overhead to the total execution time.
+# shellcheck disable=SC2034  # used elsewhere
+TEST_EXECUTION_TIMEOUT=60m
+
+# shellcheck disable=SC2034  # used elsewhere
+# Increase greenboot timeout for optional packages (more services to start)
+GREENBOOT_TIMEOUT=1200
+
 # Redefine network-related settings to use the dedicated network bridge
 VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")"
 # shellcheck disable=SC2034  # used elsewhere
@@ -17,6 +26,7 @@ scenario_create_vms() {
     if [[ "${UNAME_M}" =~ aarch64 ]]; then
         networks="${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}"
     fi
+
     LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}"
     # Three nics - one for sriov, one for macvlan, another for ipvlan (they cannot enslave the same interface)
     launch_vm rhel98-bootc --network "${networks}" --vm_disksize 25 --vm_vcpus 4
diff --git a/test/scenarios-bootc/upstream/cos10-src@configuration.sh b/test/scenarios-bootc/upstream/cos10-src@configuration.sh
deleted file mode 100644
index bbe0b65d80..0000000000
--- a/test/scenarios-bootc/upstream/cos10-src@configuration.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-bootc.ks.template cos10-bootc-source
-    launch_vm centos10-bootc
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    run_tests host1 suites/configuration/
-}
diff --git a/test/scenarios-bootc/upstream/cos10-src@greenboot.sh b/test/scenarios-bootc/upstream/cos10-src@greenboot.sh
deleted file mode 100644
index 92b8c8c013..0000000000
--- a/test/scenarios-bootc/upstream/cos10-src@greenboot.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-bootc.ks.template cos10-bootc-source
-    launch_vm centos10-bootc
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    run_tests host1 suites/greenboot/
-}
diff --git a/test/scenarios-bootc/upstream/cos10-src@isolated-net.sh b/test/scenarios-bootc/upstream/cos10-src@isolated-net.sh
deleted file mode 100644
index f2d0352297..0000000000
--- a/test/scenarios-bootc/upstream/cos10-src@isolated-net.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-# Redefine network-related settings to use the isolated network bridge
-VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_ISOLATED_NETWORK}")"
-# shellcheck disable=SC2034  # used elsewhere
-MIRROR_REGISTRY_URL="${VM_BRIDGE_IP}:${MIRROR_REGISTRY_PORT}/microshift"
-
-scenario_create_vms() {
-    prepare_kickstart host1 kickstart-bootc-isolated.ks.template cos10-bootc-source-isolated
-    # Use the isolated network when creating a VM
-    launch_vm centos10-bootc --network "${VM_ISOLATED_NETWORK}"
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    run_tests host1 suites/network/isolated-network.robot
-}
diff --git a/test/scenarios-bootc/upstream/cos10-src@multi-nic.sh b/test/scenarios-bootc/upstream/cos10-src@multi-nic.sh
deleted file mode 100644
index e1f8bd6ead..0000000000
--- a/test/scenarios-bootc/upstream/cos10-src@multi-nic.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-scenario_create_vms() {
-    prepare_kickstart host1 kickstart-bootc.ks.template cos10-bootc-source
-    # Using multus as secondary network to have 2 nics in different networks.
-    launch_vm centos10-bootc --network default,"${VM_MULTUS_NETWORK}"
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    local -r vmname=$(full_vm_name host1)
-    local -r vm_ip1=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | head -1)
-    local -r vm_ip2=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | tail -1)
-
-    run_tests host1 \
-        --variable "USHIFT_HOST_IP1:${vm_ip1}" \
-        --variable "USHIFT_HOST_IP2:${vm_ip2}" \
-        suites/network/multi-nic.robot
-}
diff --git a/test/scenarios-bootc/upstream/cos10-src@optional.sh b/test/scenarios-bootc/upstream/cos10-src@optional.sh
deleted file mode 100644
index 12cd56812b..0000000000
--- a/test/scenarios-bootc/upstream/cos10-src@optional.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-# Redefine network-related settings to use the dedicated network bridge
-VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")"
-# shellcheck disable=SC2034  # used elsewhere
-WEB_SERVER_URL="http://${VM_BRIDGE_IP}:${WEB_SERVER_PORT}"
-
-scenario_create_vms() {
-    LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template cos10-bootc-source-optionals
-    # Two nics - one for macvlan, another for ipvlan (they cannot enslave the same interface)
-    launch_vm centos10-bootc --network "${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}" --vm_disksize 25
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    local skip_args=""
-
-    skip_args="--skip sriov"
-    if [[ "${UNAME_M}" =~ aarch64 ]]; then
-        skip_args+=" --skip tls-scanner"
-    fi
-    # shellcheck disable=SC2086
-    run_tests host1 \
-        --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "LOKI_HOST:$(hostname)" \
-        ${skip_args} \
-        suites/optional/
-}
diff --git a/test/scenarios-bootc/upstream/cos10-src@standard-suite1.sh b/test/scenarios-bootc/upstream/cos10-src@standard-suite1.sh
deleted file mode 100644
index d30eb6ce03..0000000000
--- a/test/scenarios-bootc/upstream/cos10-src@standard-suite1.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-scenario_create_vms() {
-    prepare_kickstart host1 kickstart-bootc.ks.template cos10-bootc-source
-    launch_vm centos10-bootc
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    run_tests host1 \
-        --variable "EXPECTED_OS_VERSION:10" \
-        suites/standard1/
-}
diff --git a/test/scenarios-bootc/upstream/cos10-src@standard-suite2.sh b/test/scenarios-bootc/upstream/cos10-src@standard-suite2.sh
deleted file mode 100644
index 26d1f1f3e6..0000000000
--- a/test/scenarios-bootc/upstream/cos10-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-bootc.ks.template cos10-bootc-source
-    launch_vm centos10-bootc
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    run_tests host1 suites/standard2
-}
diff --git a/test/scenarios-bootc/upstream/cos9-src@configuration.sh b/test/scenarios-bootc/upstream/cos9-src@configuration.sh
deleted file mode 100644
index 5ffd5efbe6..0000000000
--- a/test/scenarios-bootc/upstream/cos9-src@configuration.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-bootc.ks.template cos9-bootc-source
-    launch_vm centos9-bootc
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    run_tests host1 suites/configuration/
-}
diff --git a/test/scenarios-bootc/upstream/cos9-src@greenboot.sh b/test/scenarios-bootc/upstream/cos9-src@greenboot.sh
deleted file mode 100644
index d0dfdc7f0f..0000000000
--- a/test/scenarios-bootc/upstream/cos9-src@greenboot.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-bootc.ks.template cos9-bootc-source
-    launch_vm centos9-bootc
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    run_tests host1 suites/greenboot/
-}
diff --git a/test/scenarios-bootc/upstream/cos9-src@isolated-net.sh b/test/scenarios-bootc/upstream/cos9-src@isolated-net.sh
deleted file mode 100644
index 71a96e68b5..0000000000
--- a/test/scenarios-bootc/upstream/cos9-src@isolated-net.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-# Redefine network-related settings to use the isolated network bridge
-VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_ISOLATED_NETWORK}")"
-# shellcheck disable=SC2034  # used elsewhere
-MIRROR_REGISTRY_URL="${VM_BRIDGE_IP}:${MIRROR_REGISTRY_PORT}/microshift"
-
-scenario_create_vms() {
-    prepare_kickstart host1 kickstart-bootc-isolated.ks.template cos9-bootc-source-isolated
-    # Use the isolated network when creating a VM
-    launch_vm centos9-bootc --network "${VM_ISOLATED_NETWORK}"
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    run_tests host1 suites/network/isolated-network.robot
-}
diff --git a/test/scenarios-bootc/upstream/cos9-src@multi-nic.sh b/test/scenarios-bootc/upstream/cos9-src@multi-nic.sh
deleted file mode 100644
index 91f30b6335..0000000000
--- a/test/scenarios-bootc/upstream/cos9-src@multi-nic.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-scenario_create_vms() {
-    prepare_kickstart host1 kickstart-bootc.ks.template cos9-bootc-source
-    # Using multus as secondary network to have 2 nics in different networks.
-    launch_vm centos9-bootc --network default,"${VM_MULTUS_NETWORK}"
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    local -r vmname=$(full_vm_name host1)
-    local -r vm_ip1=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | head -1)
-    local -r vm_ip2=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | tail -1)
-
-    run_tests host1 \
-        --variable "USHIFT_HOST_IP1:${vm_ip1}" \
-        --variable "USHIFT_HOST_IP2:${vm_ip2}" \
-        suites/network/multi-nic.robot
-}
diff --git a/test/scenarios-bootc/upstream/cos9-src@optional.sh b/test/scenarios-bootc/upstream/cos9-src@optional.sh
deleted file mode 100644
index feb96ef7b9..0000000000
--- a/test/scenarios-bootc/upstream/cos9-src@optional.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-# Redefine network-related settings to use the dedicated network bridge
-VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")"
-# shellcheck disable=SC2034  # used elsewhere
-WEB_SERVER_URL="http://${VM_BRIDGE_IP}:${WEB_SERVER_PORT}"
-
-scenario_create_vms() {
-    LVM_SYSROOT_SIZE=20480 prepare_kickstart host1 kickstart-bootc.ks.template cos9-bootc-source-optionals
-    # Two nics - one for macvlan, another for ipvlan (they cannot enslave the same interface)
-    launch_vm centos9-bootc --network "${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}" --vm_disksize 25
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-
-scenario_run_tests() {
-    local skip_args=""
-
-    skip_args="--skip sriov"
-    if [[ "${UNAME_M}" =~ aarch64 ]]; then
-        skip_args+=" --skip tls-scanner"
-    fi
-    # shellcheck disable=SC2086
-    run_tests host1 \
-        --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "LOKI_HOST:$(hostname)" \
-        ${skip_args} \
-        suites/optional/
-}
diff --git a/test/scenarios-bootc/upstream/cos9-src@standard-suite1.sh b/test/scenarios-bootc/upstream/cos9-src@standard-suite1.sh
deleted file mode 100644
index 2d705e8dd6..0000000000
--- a/test/scenarios-bootc/upstream/cos9-src@standard-suite1.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Sourced from scenario.sh and uses functions defined there.
-
-scenario_create_vms() {
-    prepare_kickstart host1 kickstart-bootc.ks.template cos9-bootc-source
-    launch_vm centos9-bootc
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    run_tests host1 \
-        --variable "EXPECTED_OS_VERSION:9" \
-        suites/standard1/
-}
diff --git a/test/scenarios-bootc/upstream/cos9-src@standard-suite2.sh b/test/scenarios-bootc/upstream/cos9-src@standard-suite2.sh
deleted file mode 100644
index e6fbf1f12c..0000000000
--- a/test/scenarios-bootc/upstream/cos9-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-bootc.ks.template cos9-bootc-source
-    launch_vm centos9-bootc
-}
-
-scenario_remove_vms() {
-    remove_vm host1
-}
-
-scenario_run_tests() {
-    run_tests host1 suites/standard2
-}
diff --git a/test/scenarios/periodics/el98-src@optional.sh b/test/scenarios/periodics/el98-src@optional.sh
index 5952472fe0..4ef12c68d9 100644
--- a/test/scenarios/periodics/el98-src@optional.sh
+++ b/test/scenarios/periodics/el98-src@optional.sh
@@ -7,6 +7,10 @@
 # shellcheck disable=SC2034  # used elsewhere
 TEST_EXECUTION_TIMEOUT=60m
 
+# shellcheck disable=SC2034  # used elsewhere
+# Increase greenboot timeout for optional packages (more services to start)
+GREENBOOT_TIMEOUT=1200
+
 # Redefine network-related settings to use the dedicated network bridge
 VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")"
 # shellcheck disable=SC2034  # used elsewhere
diff --git a/test/scenarios/releases/el98-lrel@optional.sh b/test/scenarios/releases/el98-lrel@optional.sh
index cefa822684..7dedd16537 100644
--- a/test/scenarios/releases/el98-lrel@optional.sh
+++ b/test/scenarios/releases/el98-lrel@optional.sh
@@ -2,6 +2,15 @@
 
 # Sourced from scenario.sh and uses functions defined there.
 
+# Each optional suite restarts MicroShift with its own kustomizePaths config,
+# adding ~10 minutes of restart overhead to the total execution time.
+# shellcheck disable=SC2034  # used elsewhere
+TEST_EXECUTION_TIMEOUT=60m
+
+# shellcheck disable=SC2034  # used elsewhere
+# Increase greenboot timeout for optional packages (more services to start)
+GREENBOOT_TIMEOUT=1200
+
 # Redefine network-related settings to use the dedicated network bridge
 VM_BRIDGE_IP="$(get_vm_bridge_ip "${VM_MULTUS_NETWORK}")"
 # shellcheck disable=SC2034  # used elsewhere