diff --git a/config/Config-images.in b/config/Config-images.in
index 6d240e772f..93d5682a4c 100644
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -79,7 +79,8 @@ menu "Target Images"
 
 	menuconfig TARGET_ROOTFS_EXT4FS
 		bool "ext4"
-		default n
+		default y if USES_EXT4
+		default n if TARGET_x86
 		help
 		  Build an ext4 root filesystem.
 
@@ -288,7 +289,8 @@ menu "Target Images"
 	config TARGET_IMAGES_GZIP
 		bool "GZip images"
 		depends on TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS || TARGET_x86
-		default n
+		default y
+		default n if TARGET_x86
 
 	comment "Image Options"
 
diff --git a/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh b/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh
index ab915db2f1..bac67a44d2 100644
--- a/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh
@@ -150,7 +150,7 @@ platform_do_upgrade_uDPU() {
 platform_copy_config_uDPU() {
 	# Config is saved on the /misc partition and copied on the rootfs after the reboot
 	if [ -f /tmp/sysupgrade.tgz ]; then
-		cp -f /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz
+		cp -f /tmp/sysupgrade.tgz /misc/
 		sync
 	fi
 }