diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/include/ti33x.inc b/layers/meta-netmodule-legacy-bsp/conf/machine/include/ti33x.inc
index aeeb1b6..3f13b8c 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/include/ti33x.inc
+++ b/layers/meta-netmodule-legacy-bsp/conf/machine/include/ti33x.inc
@@ -22,14 +22,13 @@ include conf/machine/include/arm/armv7a/tune-cortexa8.inc
 
 # IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap"
 # EXTRA_IMAGECMD_jffs2 = "-lnp "
-# WKS_FILE ?= "beaglebone-yocto.wks"
 # IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage"
 # do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
 
 # SERIAL_CONSOLES = "115200;ttyO0"
 
-# PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
-# PREFERRED_VERSION_linux-yocto ?= "4.18%"
+WKS_FILE ?= "nm-am335x-mmc.wks"
+do_image_wic[depends] += "virtual/bootloader:do_deploy"
 
 KERNEL_IMAGETYPE = "zImage"
 
diff --git a/layers/meta-netmodule-legacy-bsp/wic/nm-am335x-mmc.wks b/layers/meta-netmodule-legacy-bsp/wic/nm-am335x-mmc.wks
new file mode 100644
index 0000000..419c96c
--- /dev/null
+++ b/layers/meta-netmodule-legacy-bsp/wic/nm-am335x-mmc.wks
@@ -0,0 +1,13 @@
+# Dual root partition for sitara devices
+
+part SPL --offset 256S --source rawcopy --sourceparams="file=MLO" --ondisk mmcblk1 --part-name "spl" --no-table
+part u-boot --offset 768S --source rawcopy --sourceparams="file=u-boot.img" --ondisk mmcblk1 --part-name "uboot0" --no-table
+part u-boot --offset 6912S --source rawcopy --sourceparams="file=u-boot.img" --ondisk mmcblk1 --part-name "uboot1" --no-table
+
+part / --source rootfs --fstype=ext4 --ondisk mmcblk1 --fixed-size 1G --label "rootfs0"
+part / --source rootfs --fstype=ext4 --ondisk mmcblk1 --fixed-size 1G --label "rootfs1"
+
+# Shared data partition to be extended on live system
+part /data --fstype=ext4 --ondisk mmcblk1 --size 100M --label "data" --part-name "data"
+
+bootloader --ptable gpt
diff --git a/layers/meta-nwl-distro/classes/nwl-image.bbclass b/layers/meta-nwl-distro/classes/nwl-image.bbclass
index dec4772..3f9fadf 100644
--- a/layers/meta-nwl-distro/classes/nwl-image.bbclass
+++ b/layers/meta-nwl-distro/classes/nwl-image.bbclass
@@ -1,2 +1,5 @@
 # Base classe for all image based on NWL
+COREOS_IMAGE_GENERATE_SWU = "0"
+COREOS_IMAGE_GENERATE_INSTALLER = "0"
+
 inherit coreos-image
diff --git a/layers/meta-nwl-distro/recipes-core/images/nwl-test-image.bb b/layers/meta-nwl-distro/recipes-core/images/nwl-test-image.bb
index 60e7efc..c51c495 100644
--- a/layers/meta-nwl-distro/recipes-core/images/nwl-test-image.bb
+++ b/layers/meta-nwl-distro/recipes-core/images/nwl-test-image.bb
@@ -15,3 +15,5 @@ inherit nwl-image
 # Add features and packages that are used in our tests:
 IMAGE_FEATURES += "ssh-server networkmanager swupdate"
 IMAGE_INSTALL:append = " packagegroup-core-full-cmdline swupdate-www"
+
+IMAGE_FSTYPES += "wic.xz wic.bmap"