diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf
index f653595cd..5a07bc112 100644
--- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf
@@ -111,6 +111,11 @@ IMAGE_FSTYPES += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \
 # Default image for install scripts
 DEFAULT_IMAGE_NAME ?= "dey-image-qt"
 
+# Wic files
+WKS_FILES += " \
+    ccmp2-1GB.wks.in \
+"
+
 # Remove additional bluetooth packages
 MACHINE_BLUETOOTH_EXTRA_INSTALL = ""
 
@@ -147,4 +152,4 @@ IMAGE_ROOTFS_MAXSIZE = "1572864"
 # Default overlayfs_etc mount point and type
 OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data"
 OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p10"
-OVERLAYFS_ETC_FSTYPE ?= "ext4"
\ No newline at end of file
+OVERLAYFS_ETC_FSTYPE ?= "ext4"
diff --git a/meta-digi-arm/conf/machine/include/ccmp2.inc b/meta-digi-arm/conf/machine/include/ccmp2.inc
index 35884e15a..8e974965f 100644
--- a/meta-digi-arm/conf/machine/include/ccmp2.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp2.inc
@@ -85,3 +85,10 @@ SIGN_SUFFIX ?= "_Signed"
 # =========================================================================
 # activate/deactivate the debug and trace on boot stage
 ST_DEBUG_TRACE = "0"
+
+# Wic files
+WKS_FILE_DEPENDS ?= " \
+    virtual/bootloader \
+    virtual/trusted-firmware-a \
+    ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'virtual/optee-os', '', d)} \
+"
diff --git a/meta-digi-arm/wic/ccmp2-1GB.wks.in b/meta-digi-arm/wic/ccmp2-1GB.wks.in
new file mode 100644
index 000000000..54dbbaed4
--- /dev/null
+++ b/meta-digi-arm/wic/ccmp2-1GB.wks.in
@@ -0,0 +1,42 @@
+# short-description: Create SD card image with a boot partition (1GB)
+# long-description: Creates a partitioned SD card image (1GB)
+#
+#  - -------- ------------- ------ ------ ------------ -------- --------- ------------------------
+# | | TFA(2) | Metadata(2) | FIPA | FIPB | U-BOOT ENV | linux  | rootfs  | safe | safe2 | data   |
+#  - -------- ------------- ------ ------ ------------ -------- --------- ------------------------
+# ^ ^        ^             ^      ^      ^            ^        ^         ^      ^       ^        ^
+# | |        |             |      |      |            |        |         |      |       |        |
+# 0 17kB   542kB        1.06MB  5.26MB 9.45MB      9.97MB    77.1MB   898MB                    1032MB
+#
+# Warning: the first stage of boot (here fsbl1, fsbl2, metadata1, metadata2, fipa, fipb) MUST be on GPT partition to be detected.
+#
+
+# FSBL partitions aka TF-A BL2
+part fsbla1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbla1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-${MACHINE}-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K --align 17
+part fsbla2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbla2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-${MACHINE}-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K
+
+# Metadata partitions
+part metadata1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K
+part metadata2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K
+
+# Fip partitions
+part fip-a   --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-a --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-${MACHINE}-optee.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 4fd84c93-54ef-463f-a7ef-ae25ff887087
+part fip-b   --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-b --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-${MACHINE}-optee.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 09c54952-d5bf-45af-acee-335303766fb3
+
+# U-BOOT env
+part u-boot-env --source empty --part-name=uboot-env --ondisk mmcblk --part-type 0x8301 --fixed-size 512K
+
+# linux
+part --source rawcopy --sourceparams="file=${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.boot.vfat" --ondisk mmcblk --fstype=vfat --part-name=linux --active --fixed-size 64M
+
+# Rootfs
+part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 783M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 --part-name=rootfs
+
+# Safe
+part safe --source empty --ondisk mmcblk --fsoptions "noauto" --part-name=safe --part-type 0x8301 --fixed-size 256K
+part safe2 --source empty --ondisk mmcblk --fsoptions "noauto" --part-name=safe2 --part-type 0x8301 --fixed-size 256K
+
+# data
+part data --ondisk mmcblk --fstype=ext4 --label data --fixed-size 128M --part-name=data
+
+bootloader --ptable gpt