diff --git a/fedora/create_image.sh b/fedora/create_image.sh
index 1c610d2..a98dbc1 100755
--- a/fedora/create_image.sh
+++ b/fedora/create_image.sh
@@ -44,6 +44,11 @@ if [[ ! -f "$ISO_PATH" ]]; then
     wget -O "$ISO_PATH" $ISO_DOWNLOAD_LINK
 fi
 
+if [[ -f $OUTPUT_ISO ]]; then
+    echo "$OUTPUT_ISO already exists, replacing the file."
+    rm -f "$OUTPUT_ISO"
+fi
+
 xorriso -indev $ISO_PATH \
     -outdev $OUTPUT_ISO \
     -compliance no_emul_toc \
diff --git a/fedora/ks.cfg b/fedora/ks.cfg
index 384e87e..aa96dc0 100644
--- a/fedora/ks.cfg
+++ b/fedora/ks.cfg
@@ -60,6 +60,9 @@ sed -i 's/^SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config
 # Disable Gnome logout prompt (if GNOME is installed)
 gsettings set org.gnome.SessionManager logout-prompt false || true
 
+# Regenerate initrafms to force to include all common disk drivers
+dracut --regenerate-all --force --add-drivers "ahci sd_mod sr_mod nvme usb-storage"
+
 %end
 
 reboot