diff --git a/board/aarch64/rootfs/lib/firmware/mrvl/x3310fw.hdr b/board/aarch64/rootfs/usr/lib/firmware/mrvl/x3310fw.hdr
similarity index 100%
rename from board/aarch64/rootfs/lib/firmware/mrvl/x3310fw.hdr
rename to board/aarch64/rootfs/usr/lib/firmware/mrvl/x3310fw.hdr
diff --git a/board/aarch64/rootfs/lib/firmware/mrvl/x33x0fw_0_3_11_0_11832.hdr b/board/aarch64/rootfs/usr/lib/firmware/mrvl/x33x0fw_0_3_11_0_11832.hdr
similarity index 100%
rename from board/aarch64/rootfs/lib/firmware/mrvl/x33x0fw_0_3_11_0_11832.hdr
rename to board/aarch64/rootfs/usr/lib/firmware/mrvl/x33x0fw_0_3_11_0_11832.hdr
diff --git a/board/common/rootfs/bin/ip b/board/common/rootfs/bin/ip
deleted file mode 120000
index 3a485e5f..00000000
--- a/board/common/rootfs/bin/ip
+++ /dev/null
@@ -1 +0,0 @@
-/sbin/ip
\ No newline at end of file
diff --git a/board/common/rootfs/bin/askpass b/board/common/rootfs/usr/bin/askpass
similarity index 100%
rename from board/common/rootfs/bin/askpass
rename to board/common/rootfs/usr/bin/askpass
diff --git a/board/common/rootfs/bin/clish b/board/common/rootfs/usr/bin/clish
similarity index 100%
rename from board/common/rootfs/bin/clish
rename to board/common/rootfs/usr/bin/clish
diff --git a/board/common/rootfs/bin/onieprom b/board/common/rootfs/usr/bin/onieprom
similarity index 100%
rename from board/common/rootfs/bin/onieprom
rename to board/common/rootfs/usr/bin/onieprom
diff --git a/board/common/rootfs/bin/yorn b/board/common/rootfs/usr/bin/yorn
similarity index 100%
rename from board/common/rootfs/bin/yorn
rename to board/common/rootfs/usr/bin/yorn
diff --git a/board/common/rootfs/usr/sbin/ip b/board/common/rootfs/usr/sbin/ip
deleted file mode 120000
index 3a485e5f..00000000
--- a/board/common/rootfs/usr/sbin/ip
+++ /dev/null
@@ -1 +0,0 @@
-/sbin/ip
\ No newline at end of file
diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig
index d26e23bd..d0cf9714 100644
--- a/configs/aarch64_defconfig
+++ b/configs/aarch64_defconfig
@@ -24,6 +24,7 @@ BR2_TARGET_TZ_INFO=y
 BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/rootfs"
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
+BR2_ROOTFS_MERGED_USR=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.34"
diff --git a/configs/r2s_defconfig b/configs/r2s_defconfig
index 3b5d5855..f7c7e7a5 100644
--- a/configs/r2s_defconfig
+++ b/configs/r2s_defconfig
@@ -26,6 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/genimage.cfg"
+BR2_ROOTFS_MERGED_USR=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.34"
diff --git a/configs/x86_64_defconfig b/configs/x86_64_defconfig
index 600decea..5630e474 100644
--- a/configs/x86_64_defconfig
+++ b/configs/x86_64_defconfig
@@ -23,6 +23,7 @@ BR2_TARGET_TZ_INFO=y
 BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/rootfs"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
+BR2_ROOTFS_MERGED_USR=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.34"