diff --git a/roles/desktop-common/templates/grubconfig b/roles/desktop-common/templates/grubconfig
index fea0dbd..bf95809 100644
--- a/roles/desktop-common/templates/grubconfig
+++ b/roles/desktop-common/templates/grubconfig
@@ -5,12 +5,17 @@
 #   info -f grub -n 'Simple configuration'
 
 GRUB_DEFAULT=0
+GRUB_HIDDEN_TIMEOUT=0
+GRUB_HIDDEN_TIMEOUT_QUIET="true"
+GRUB_TIMEOUT=0
 GRUB_TIMEOUT_STYLE=hidden
-GRUB_TIMEOUT=1
 GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
 GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
 GRUB_CMDLINE_LINUX=""
 
+# Work around probing for other OSs resetting timeout
+GRUB_DISABLE_OS_PROBER="true"
+
 # Uncomment to enable BadRAM filtering, modify to suit your needs
 # This works with Linux (no patch required) and with any kernel that obtains
 # the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)