diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/include/armada.inc b/layers/meta-netmodule-legacy-bsp/conf/machine/include/armada.inc
index a934c1c..078276f 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/include/armada.inc
+++ b/layers/meta-netmodule-legacy-bsp/conf/machine/include/armada.inc
@@ -16,6 +16,9 @@ INODE_SIZE = "1024"
 DIR_INODE_SIZE = "1024"
 FILE_INODE_SIZE = "0"
 
+WKS_FILE ?= "nm-armada-385-mmc.wks"
+do_image_wic[depends] += "virtual/bootloader:do_deploy"
+
 MACHINE_FEATURES:remove = "bluetooth"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-nrsw"
diff --git a/layers/meta-netmodule-legacy-bsp/recipes-kernel/linux/files/armada/defconfig b/layers/meta-netmodule-legacy-bsp/recipes-kernel/linux/files/armada/defconfig
index 00c4c1f..832f114 100644
--- a/layers/meta-netmodule-legacy-bsp/recipes-kernel/linux/files/armada/defconfig
+++ b/layers/meta-netmodule-legacy-bsp/recipes-kernel/linux/files/armada/defconfig
@@ -666,7 +666,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
+CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
 # end of Partition Types
diff --git a/layers/meta-netmodule-legacy-bsp/wic/nm-armada-385-mmc.wks b/layers/meta-netmodule-legacy-bsp/wic/nm-armada-385-mmc.wks
new file mode 100644
index 0000000..6b13b20
--- /dev/null
+++ b/layers/meta-netmodule-legacy-bsp/wic/nm-armada-385-mmc.wks
@@ -0,0 +1,11 @@
+# Dual root partition for armada devices
+
+bootloader --ptable gpt
+
+part u-boot --source rawcopy --sourceparams="file=u-boot-spl.kwb" --ondisk mmcblk --no-table --align 384
+
+part / --source rootfs --fstype=ext4 --ondisk mmcblk0 --fixed-size 1G --label "rootfs0"
+part / --source rootfs --fstype=ext4 --ondisk mmcblk0 --fixed-size 1G --label "rootfs1"
+
+# Shared data partition
+part /data --fstype=ext4 --ondisk mmcblk0 --size 100M --label data