diff --git a/fedora-riscv64-developer-rawhide.ks b/fedora-riscv64-developer-rawhide.ks
index bf274b1..f21bf1c 100644
--- a/fedora-riscv64-developer-rawhide.ks
+++ b/fedora-riscv64-developer-rawhide.ks
@@ -234,6 +234,16 @@ grubby-deprecated
 # Disable default repositories (not riscv64 in upstream)
 dnf config-manager --set-disabled rawhide updates updates-testing fedora fedora-modular fedora-cisco-openh264 updates-modular updates-testing-modular rawhide-modular
 
+# systemd on no-SMP boots (i.e. single core) sometimes timeout waiting for storage
+# devices. After entering emergency prompt all disk are mounted.
+# For more information see:
+# https://www.suse.com/support/kb/doc/?id=7018491
+# https://www.freedesktop.org/software/systemd/man/systemd.mount.html
+# https://github.com/systemd/systemd/issues/3446
+# We modify /etc/fstab to give more time for device detection (the problematic part)
+# and mounting processes. This should help on systems where boot takes longer.
+sed -i 's|noatime|noatime,x-systemd.device-timeout=300s,x-systemd.mount-timeout=300s|g' /etc/fstab
+
 # Create Fedora RISC-V repo
 cat << EOF > /etc/yum.repos.d/fedora-riscv.repo
 [fedora-riscv]