diff --git a/coreos-base/oem-ec2-compat/files/grub-ec2.cfg b/coreos-base/oem-ec2-compat/files/grub-ec2.cfg
index 12caf6e64c..6d5b40e0fa 100644
--- a/coreos-base/oem-ec2-compat/files/grub-ec2.cfg
+++ b/coreos-base/oem-ec2-compat/files/grub-ec2.cfg
@@ -7,7 +7,7 @@ set oem_id="ec2"
 set linux_append="modprobe.blacklist=xen_fbfront net.ifnames=0"
 
 if [ "$grub_platform" = pc ]; then
-	set linux_console="console=ttyS0,115200n8"
+	set linux_console="console=ttyS0,115200n8 nvme_core.io_timeout=255 nvme_core.max_retries=10"
 	serial com0 --speed=115200 --word=8 --parity=no
 	terminal_input serial_com0
 	terminal_output serial_com0