diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh
index a80c9232d1..54f041c74f 100755
--- a/test/bin/scenario.sh
+++ b/test/bin/scenario.sh
@@ -19,7 +19,7 @@ source "${SCRIPTDIR}/common_versions.sh"
 source "${SCRIPTDIR}/scenario_container.sh"
 
 DEFAULT_BOOT_BLUEPRINT="rhel-9.4"
-LVM_SYSROOT_SIZE="10240"
+LVM_SYSROOT_SIZE="15360"
 PULL_SECRET="${PULL_SECRET:-${HOME}/.pull-secret.json}"
 PULL_SECRET_CONTENT="$(jq -c . "${PULL_SECRET}")"
 VM_BOOT_TIMEOUT=1200 # Overall total boot times are around 15m
diff --git a/test/kickstart-templates/includes/main-prologue.cfg b/test/kickstart-templates/includes/main-prologue.cfg
index 3607812175..6155bbf94f 100644
--- a/test/kickstart-templates/includes/main-prologue.cfg
+++ b/test/kickstart-templates/includes/main-prologue.cfg
@@ -5,19 +5,19 @@ text
 reboot
 
 # Partition the disk with hardware-specific boot and swap partitions, adding an
-# LVM volume that contains a 10GB+ system root. The remainder of the volume will
-# be used by the CSI driver for storing data.
+# LVM volume that contains a system root partition of the specified size.
+# The remainder of the volume will be used by the CSI driver for storing data.
 #
-# For example, a 20GB disk may be partitioned in the following way:
+# For example, a 20GB disk with 15GB system root may be partitioned in the following way.
 #
 # NAME          MAJ:MIN RM  SIZE RO TYPE MOUNTPOINTS
 # loop0           7:0    0  7.9M  1 loop
 # sda             8:0    0   20G  0 disk
 # ├─sda1          8:1    0    1G  0 part /boot
 # └─sda2          8:2    0   19G  0 part
-#   └─rhel-root 253:0    0   10G  0 lvm  /sysroot
+#   └─rhel-root 253:0    0   15G  0 lvm  /sysroot
 # sr0            11:0    1 1024M  0 rom
-# zram0         252:0    0  3.6G  0 disk [SWAP]
+# zram0         252:0    0  3.8G  0 disk [SWAP]
 #
 zerombr
 clearpart --all --initlabel
diff --git a/test/suites/optional/olm.robot b/test/suites/optional/olm.robot
index 43fd19acd8..751fcec686 100644
--- a/test/suites/optional/olm.robot
+++ b/test/suites/optional/olm.robot
@@ -61,14 +61,19 @@ OLM Should Be Ready
 Create CatalogSource
     [Documentation]    Create CatalogSource resource with Red Hat Community Catalog Index.
     Oc Create    -f ${CATALOG_SOURCE}
-    Wait Until Keyword Succeeds    120s    5s
+    Wait Until Keyword Succeeds    5m    10s
     ...    CatalogSource Should Be Ready    ${MARKETPLACE_NAMESPACE}    redhat-operators
 
 CatalogSource Should Be Ready
     [Documentation]    Checks if CatalogSource is ready.
     [Arguments]    ${namespace}    ${name}
     ${catalog}=    Oc Get    catalogsources    ${namespace}    ${name}
-    Should Be Equal As Strings    READY    ${catalog.status.connectionState.lastObservedState}
+    TRY
+        Should Be Equal As Strings    READY    ${catalog.status.connectionState.lastObservedState}
+    EXCEPT
+        Run With Kubeconfig    oc get events -n openshift-marketplace --sort-by='.lastTimestamp'
+        Fail    Catalog Source Is Not Ready
+    END
 
 Create Subscription
     [Documentation]    Creates subscription.