diff --git a/config/Config-images.in b/config/Config-images.in
index 3a22e054c..cb6cf1267 100644
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -115,7 +115,7 @@ menu "Target Images"
 	config TARGET_ROOTFS_ISO
 		bool "iso"
 		default n
-		depends on TARGET_x86_generic
+		depends on TARGET_x86
 		help
 		  Create a bootable ISO image.
 
@@ -192,7 +192,7 @@ menu "Target Images"
 		depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
 		select PACKAGE_grub2
 		select PACKAGE_grub2-efi
-		default y
+		default n
 
 	config GRUB_CONSOLE
 		bool "Use Console Terminal (in addition to Serial)"