diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf
index ca0ca7b5..2d939d19 100644
--- a/meta-arm-bsp/conf/machine/corstone500.conf
+++ b/meta-arm-bsp/conf/machine/corstone500.conf
@@ -16,12 +16,19 @@ PREFERRED_VERSION_linux-yocto ?= "5.15%"
 
 EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot"
 
-SERIAL_CONSOLES = "115200;ttyAMA0"
+IMAGE_CLASSES += "wic_nopt"
+IMAGE_FEATURES += "debug-tweaks"
+IMAGE_FSTYPES:forcevariable = "cpio.gz squashfs wic wic.nopt"
 
-IMAGE_FSTYPES += "tar.bz2 cpio.gz"
+SERIAL_CONSOLES = "115200;ttyAMA0"
 
 # Corstone-500 u-boot configuration
 UBOOT_MACHINE = "corstone500_defconfig"
 UBOOT_IMAGE_ENTRYPOINT = "0x84000000"
 UBOOT_IMAGE_LOADADDRESS = "0x84000000"
 PREFERRED_VERSION_u-boot ?= "2022.01"
+
+# making sure EXTRA_IMAGEDEPENDS will be used while creating the image
+WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
+
+WKS_FILE ?= "core-image-minimal.corstone500.wks"