diff --git a/README.md b/README.md
index 6f98f2cdc..4a073651c 100644
--- a/README.md
+++ b/README.md
@@ -39,38 +39,6 @@ Software for the following hardware platforms is in production support:
 * ConnectCore 93 Development Kit (DVK)
   * [CC-WMX93-KIT](https://www.digi.com/products/models/cc-wmx93-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/5.0/cc93/yocto-gs_index))
 
-## ConnectCore MP13
-* ConnectCore MP13 System-on-Module (SOM)
-  * [CC-WST-DX58-NK](https://www.digi.com/products/models/cc-wst-dx58-nk)
-  * [CC-ST-DX58-ZK](https://www.digi.com/products/models/cc-st-dx58-zk)
-* ConnectCore MP13 Development Kit (DVK)
-  * [CC-WMP133-KIT](https://www.digi.com/products/models/cc-wmp133-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/5.0/ccmp13/yocto-gs_index))
-
-## ConnectCore MP15
-* ConnectCore MP15 System-on-Module (SOM)
-  * [CC-WST-DW69-NM](https://www.digi.com/products/models/cc-wst-dw69-nm)
-  * [CC-ST-DW69-ZM](https://www.digi.com/products/models/cc-st-dw69-zm)
-* ConnectCore MP15 Development Kit (DVK)
-  * [CC-WMP157-KIT](https://www.digi.com/products/models/cc-wmp157-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/5.0/ccmp15/yocto-gs_index))
-
-## ConnectCore 8M Mini
-* ConnectCore 8M Mini System-on-Module (SOM)
-  * [CC-WMX-ET8D-NN](https://www.digi.com/products/models/cc-wmx-et8d-nn)
-  * [CC-WMX-ET7D-NN](https://www.digi.com/products/models/cc-wmx-et7d-nn)
-  * [CC-MX-ET8D-ZN](https://www.digi.com/products/models/cc-mx-et8d-zn)
-  * [CC-MX-ET7D-ZN](https://www.digi.com/products/models/cc-mx-et7d-zn)
-* ConnectCore 8M Mini Development Kit (DVK)
-  * [CC-WMX8MM-KIT](https://www.digi.com/products/models/cc-wmx8mm-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/5.0/cc8mmini/yocto-gs_index))
-
-## ConnectCore 8M Nano
-* ConnectCore 8M Nano System-on-Module (SOM)
-  * [CC-WMX-FS7D-NN](https://www.digi.com/products/models/cc-wmx-fs7d-nn)
-  * [CC-WMX-FR6D-NN](https://www.digi.com/products/models/cc-wmx-fr6d-nn)
-  * [CC-MX-FS7D-ZN](https://www.digi.com/products/models/cc-mx-fs7d-zn)
-  * [CC-MX-FR6D-ZN](https://www.digi.com/products/models/cc-mx-fr6d-zn)
-* ConnectCore 8M Nano Development Kit (DVK)
-  * [CC-WMX8MN-KIT](https://www.digi.com/products/models/cc-wmx8mn-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/5.0/cc8mnano/yocto-gs_index))
-
 ## ConnectCore 8X
 * ConnectCore 8X System-on-Module (SOM)
   * [CC-WMX-JM8E-NN](https://www.digi.com/products/models/cc-wmx-jm8e-nn)
@@ -98,32 +66,6 @@ Software for the following hardware platforms is in production support:
   * [CC-SBP-WMX-JN58](https://www.digi.com/products/models/cc-sbp-wmx-jn58)
   * [CC-SBP-WMX-JN7A](https://www.digi.com/products/models/cc-sbp-wmx-jn7a)
 
-## ConnectCore 6 Plus
-* ConnectCore 6 Plus System-on-Module (SOM)
-  * [CC-WMX-KK8D-TN](https://www.digi.com/products/models/cc-wmx-kk8d-tn)
-* ConnectCore 6 Plus professional development kit
-  * [CC-WMX6P-KIT](https://www.digi.com/products/models/cc-wmx6p-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/5.0/cc6plus/yocto-gs_index))
-
-## ConnectCore 6
-* ConnectCore 6 System-on-Module (SOM)
-  * [CC-WMX-J97C-TN](https://www.digi.com/products/models/cc-wmx-j97c-tn)
-  * [CC-WMX-L96C-TE](https://www.digi.com/products/models/cc-wmx-l96c-te)
-  * [CC-WMX-L87C-TE](https://www.digi.com/products/models/cc-wmx-l87c-te)
-  * [CC-MX-L76C-Z1](https://www.digi.com/products/models/cc-mx-l76c-z1)
-  * [CC-MX-L86C-Z1](https://www.digi.com/products/models/cc-mx-l86c-z1)
-  * [CC-MX-L96C-Z1](https://www.digi.com/products/models/cc-mx-l96c-z1)
-  * [CC-WMX-L76C-TE](https://www.digi.com/products/models/cc-wmx-l76c-te)
-  * CC-WMX-K87C-FJA
-  * CC-WMX-K77C-TE
-  * CC-WMX-L97D-TN
-  * CC-WMX-J98C-FJA
-  * CC-WMX-J98C-FJA-1
-* ConnectCore 6 Jumpstart Development Kit (SBC with Connectore 6 module)
-  * [CC-WMX6-KIT](https://www.digi.com/products/models/cc-wmx6-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/5.0/cc6/yocto-gs_index))
-  * [CC-SB-WMX-J97C-1](https://www.digi.com/products/models/cc-sb-wmx-j97c-1)
-  * [CC-SB-WMX-L87C-1](https://www.digi.com/products/models/cc-sb-wmx-l87c-1)
-  * [CC-SB-WMX-L76C-1](https://www.digi.com/products/models/cc-sb-wmx-l76c-1)
-
 # Installation
 
 Digi Embedded Yocto is composed of a set of different Yocto layers that work in
@@ -152,6 +94,24 @@ Documentation is available online at https://www.digi.com/resources/documentatio
   * Updated gstreamer1.0 to v1.22.12
   * Updated OpenSSL to v3.2.3
   * Package upgrades and security fixes
+* ST-based platforms
+  * Added support to ConnectCore MP25
+  * Updated BSP
+    * Updated Trusted Firmware ARM v2.10 (based on tag 'v2.10-stm32mp-r1' by ST)
+    * Updated OP-TEE v4.0.0 (based on tag '4.0.0-stm32mp-r1' by ST)
+    * Updated U-Boot v2023.10 (based on tag 'v2023.10-stm32mp-r1' by ST)
+    * Updated Linux kernel v6.6.48 (based on tag 'v6.6-stm32mp-r1.1' by ST)
+    * Updated Wifi driver (based on 'v6.1.97-2024_1115' release from Cypress)
+    * Updated Wifi firmware to 'imx-scarthgap-jaculus_r1.0' release from Murata
+* NXP-based platforms
+  * Added support to ConnectCore 6UL
+  * Added support to ConnectCore 8X
+  * Added support to ConnectCore 91
+  * Added support to ConnectCore 93
+  * Updated BSP
+    * Updated U-Boot v2024.04 (based on tag 'lf-6.6.52-2.2.0' by NXP)
+    * Updated Linux kernel v6.6.52 (based on tag 'lf-6.6.52-2.2.0' by NXP)
+
 
 # Known Issues and Limitations
 
@@ -175,23 +135,15 @@ updated list can be found on the online documentation.
   * When working as an access point, DFS-capable channels in the 5GHz band are
     not supported.
   * For P2P connections Digi recommends "Negotiated GO" modes. The QCA6564
-    devices (ConnectCore 6UL, ConnectCore 6 Plus, and ConnectCore 8M Nano) fail
-    to join autonomous groups.
+    devices fail to join autonomous groups.
 
-## ConnectCore MP25
+## ConnectCore 93
 
-* ConnectCore MP2 System-on-Module (SOM)
-  * Power management
-    * Power management support is not yet implemented.
-  * Firmware update
-    * Update single file and update with rdiff don't currently work.
-
-## ConnectCore MP15/MP13
-
-* ConnectCore MP1 System-on-Module (SOM)
-  * Wireless
-    * P2P on the ConnectCore MP1 doesn't currently work in concurrency with
-      other modes (station or SoftAP).
+* ConnectCore 93 System-on-Module (SOM)
+  * Trustfence
+    * It is not possible to close a device using U-Boot v2024.04 for Secure boot
+      on a device with CPU revision A0. However, it is possible to boot v2024.04
+      signed images on an already closed device.
 
 ## ConnectCore 6UL
 
diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf
index 069b922e8..b083a1dce 100644
--- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf
@@ -39,6 +39,7 @@ UBOOT_DEVICETREE = "${STM32MP_DEVICETREE}"
 # =========================================================================
 # Define list of devicetree per supported storage
 STM32MP_DT_FILES_EMMC = "ccmp25-dvk"
+STM32MP_DT_FILES_SDCARD = "${STM32MP_DT_FILES_EMMC}"
 
 # Extra DTB for board - need to specify it with .dtb ...
 STM32MP_KERNEL_DEVICETREE:ccmp25-dvk += " \
diff --git a/meta-digi-arm/conf/machine/include/ccimx9.inc b/meta-digi-arm/conf/machine/include/ccimx9.inc
index bd36327df..1eb93c2a1 100644
--- a/meta-digi-arm/conf/machine/include/ccimx9.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx9.inc
@@ -102,6 +102,3 @@ IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \
 OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data"
 OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p7"
 OVERLAYFS_ETC_FSTYPE ?= "ext4"
-
-PREFERRED_VERSION_nativesdk-trustfence-sign-tools:ccimx9 ?= "2024.04"
-PREFERRED_VERSION_trustfence-sign-tools-native:ccimx9    ?= "2024.04"
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index 9bcbdcaae..bd7617838 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -84,7 +84,7 @@ DEFAULT_IMAGE_NAME ??= "dey-image-qt"
 IMAGE_LINK_NAME = "${IMAGE_BASENAME}${IMAGE_MACHINE_SUFFIX}"
 
 # List of graphical images names (for install scripts)
-GRAPHICAL_IMAGES ?= "dey-image-crank dey-image-qt dey-image-webkit dey-image-lvgl"
+GRAPHICAL_IMAGES ?= "dey-image-qt dey-image-webkit dey-image-lvgl"
 
 # Default wayland socket
 WAYLAND_DISPLAY ?= "wayland-1"
@@ -114,4 +114,4 @@ BOOTLOADER_SEEK_BOOTPART ?= "0"
 # Default all platforms to use /root as the home root folder.
 # This is otherwise forced by systemd because of hard-coded paths
 # in systemd source code.
-ROOT_HOME ?= "/root"
\ No newline at end of file
+ROOT_HOME ?= "/root"
diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_4.0.0.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_4.0.0.bbappend
index daa71e9d7..091854899 100644
--- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_4.0.0.bbappend
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_4.0.0.bbappend
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022-2024, Digi International Inc.
+# Copyright (C) 2022-2025, Digi International Inc.
 #
 
 # Select internal or Github OPTEE repo
diff --git a/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon.bb b/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon.bb
index 78f5d8a1d..2efc433b7 100644
--- a/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon.bb
@@ -6,8 +6,9 @@ LICENSE = "CYPRESS-EULA"
 LIC_FILES_CHKSUM = "file://${S}/cyw-bt-patch/LICENCE.cypress;md5=cbc5f665d04f741f1e006d2096236ba7"
 
 SRC_URI = " \
+    https://github.com/Infineon/ifx-linux-firmware/archive/refs/tags/release-v6.1.97-2024_1115.tar.gz;destsuffix=cyw-fmac-fw-ifx;name=cyw-fmac-fw-ifx \
     git://github.com/murata-wireless/cyw-fmac-fw;protocol=http;branch=jaculus;destsuffix=cyw-fmac-fw;name=cyw-fmac-fw \
-    git://github.com/murata-wireless/cyw-fmac-nvram;protocol=http;branch=master;destsuffix=cyw-fmac-nvram;name=cyw-fmac-nvram \
+    git://github.com/murata-wireless/cyw-fmac-nvram;protocol=http;branch=jaculus;destsuffix=cyw-fmac-nvram;name=cyw-fmac-nvram \
     git://github.com/murata-wireless/cyw-bt-patch;protocol=http;branch=master;destsuffix=cyw-bt-patch;name=cyw-bt-patch \
     git://github.com/murata-wireless/cyw-fmac-utils-imx32;protocol=http;branch=master;destsuffix=cyw-fmac-utils-imx32;name=cyw-fmac-utils-imx32 \
     git://github.com/murata-wireless/cyw-fmac-utils-imx64;protocol=http;branch=master;destsuffix=cyw-fmac-utils-imx64;name=cyw-fmac-utils-imx64 \
@@ -21,12 +22,14 @@ SRC_URI:append:ccmp1 = " \
 "
 
 SRC_URI:append:ccmp2 = " \
+    file://cyfmac55500-sdio.txt \
     file://mbt \
 "
 
-SRCREV_cyw-fmac-fw="acc1006a873a196495ed209bd18b3f47b4128426"
-SRCREV_cyw-fmac-nvram="fd6587f8183b612ea52404c7a73aeb2698099587"
-SRCREV_cyw-bt-patch="83f8e16423c47e195f52a06fd68ac92a20a80a9f"
+SRC_URI[cyw-fmac-fw-ifx.sha256sum]="34f5bfac6476d849af26f945705dc5a19965825333840405ef25dcd835d521d7"
+SRCREV_cyw-fmac-fw="a5cb86a5d11192ba6e7738f82b4d2dc9eeeca679"
+SRCREV_cyw-fmac-nvram="146d1438372b6c4857f92b8769b91c1801d3ede2"
+SRCREV_cyw-bt-patch="742f5cec14c98000dc532518c9e5acaec40de668"
 SRCREV_cyw-fmac-utils-imx32="dad9ed86bf6691910197bc91d42a45ea8175180c"
 SRCREV_cyw-fmac-utils-imx64="368bd9a4163e115468d79c238192b41f6266c523"
 
@@ -73,7 +76,7 @@ do_install:append:ccmp1 () {
 
 	# Install WLAN firmware file (*.bin) and Regulatory binary file (*.clm_blob)
 	# For Murata 2AE (LBEE5PK2AE-564)
-	install -m 444 ${S}/cyw-fmac-fw/cyfmac4373-sdio.2AE.bin ${D}${base_libdir}/firmware/cypress/cyfmac4373-sdio.bin
+	install -m 444 ${S}/ifx-linux-firmware-release-v6.1.97-2024_1115/firmware/cyfmac4373-sdio.industrial.bin ${D}${base_libdir}/firmware/cypress/cyfmac4373-sdio.bin
 	install -m 444 cyfmac4373-sdio_US.clm_blob ${D}${base_libdir}/firmware/cypress/cyfmac4373-sdio_US.clm_blob
 	install -m 444 cyfmac4373-sdio_World.clm_blob ${D}${base_libdir}/firmware/cypress/cyfmac4373-sdio_World.clm_blob
 
@@ -88,16 +91,16 @@ do_install:append:ccmp2 () {
 
 	# Install Bluetooth patch *.HCD file
 	# For Murata 2GY (LBEE5HY2GY) and Murata 2FY (LBEE5HY2FY)
-	install -m 444 ${S}/cyw-bt-patch/CYW55500A1_001.002.032.0040.0033_FCC.hcd ${D}${base_libdir}/firmware/brcm/CYW55500A1.hcd
+	install -m 444 ${S}/cyw-bt-patch/CYW55500A1_001.002.032.0040.0033.2FY.hcd ${D}${base_libdir}/firmware/brcm/CYW55500A1.hcd
 
 	# Install WLAN firmware file (*.bin) and Regulatory binary file (*.clm_blob)
 	# For Murata 2GY (LBEE5HY2GY) and Murata 2FY (LBEE5HY2FY)
-	install -m 444 ${S}/cyw-fmac-fw/cyfmac55500-sdio.trxse ${D}${base_libdir}/firmware/cypress/cyfmac55500-sdio.trxse
+	install -m 444 ${S}/ifx-linux-firmware-release-v6.1.97-2024_1115/firmware/cyfmac55500-sdio.trxse ${D}${base_libdir}/firmware/cypress/cyfmac55500-sdio.trxse
 	install -m 444 ${S}/cyw-fmac-fw/cyfmac55500-sdio.2FY.clm_blob ${D}${base_libdir}/firmware/cypress/cyfmac55500-sdio_US.clm_blob
 
 	# Install NVRAM files (*.txt)
 	# For Murata 2GY (LBEE5HY2GY) and Murata 2FY (LBEE5HY2FY)
-	install -m 444 ${S}/cyw-fmac-nvram/cyfmac55500-sdio.2FY.txt ${D}${base_libdir}/firmware/cypress/cyfmac55500-sdio.txt
+	install -m 444 ${S}/cyfmac55500-sdio.txt ${D}${base_libdir}/firmware/cypress/cyfmac55500-sdio.txt
 
 	# Install Manufacturing Bluetooth Test tool (MBT)
 	install -m 755 mbt ${D}${sbindir}
diff --git a/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon/cyfmac55500-sdio.txt b/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon/cyfmac55500-sdio.txt
new file mode 100644
index 000000000..328591405
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon/cyfmac55500-sdio.txt
@@ -0,0 +1,471 @@
+#CYW955513SDM2WLIPA_TAG215
+#802.11ax 1x1 Tri-Band HE20 WiFi 6/6e + BT/BLE 5.2 Combo with SDIO/SPI interface
+#Type2FY
+NVRAMRev=$Rev: 5062 $
+sromrev=11
+boardrev=0x1530
+boardtype=0x0904
+boardflags=0x00400001
+boardflags2=0x00800000
+boardflags3=0x40000100
+#boardnum=57410
+macaddr=00:90:4c:2e:c3:05
+
+#Regulatory specific
+ccode=0
+regrev=0
+
+# Board specific
+vendid=0x12be
+devid=0xbd3e
+manfid=0x2d0
+antswitch=0
+pdgain5g=0
+pdgain2g=0
+aa2g=1
+aa5g=1
+agbg0=2
+aga0=2
+extpagain5g=2
+extpagain2g=2
+rxgains2gelnagaina0=0
+rxgains2gtrisoa0=13
+rxgains2gtrelnabypa0=0
+rxgains5gelnagaina0=0
+rxgains5gtrisoa0=7
+rxgains5gtrelnabypa0=0
+rxgains5gmelnagaina0=0
+rxgains5gmtrisoa0=7
+rxgains5gmtrelnabypa0=0
+rxgains5ghelnagaina0=0
+rxgains5ghtrisoa0=7
+rxgains5ghtrelnabypa0=0
+
+# ==== RSSI related parametes start ==============================================================
+# 2G-Core0 [20MHz, 40Mhz]
+rssicorrnorm_c0=-5,0
+# ===================================
+# 5G-Core0 [20MHz(l), 40MHz(l), 80Mhz(l), 20MHz(ml), 40MHz(ml), 80Mhz(ml), 20MHz(mu), 40MHz(mu), 80Mhz(mu), 20MHz(h), 40MHz(h), 80Mhz(h)]
+# 5170 to below 5500(ch36 to ch96)   - l
+# 5500 to below 5620(ch100 to ch120) - ml
+# 5620 to below 5745(ch124 to ch144) - mu
+# 5745 to below 5835(ch149 to ch165) - h
+# ===================================
+rssicorrnorm5g_c0=7,0,0,6,0,0,3,0,0,4,0,0
+# 6G-Core0 [20MHz(u5), 40MHz(u5), 80Mhz(u5), 20MHz(u6), 40MHz(u6), 80Mhz(u6), 20MHz(u7), 40MHz(u7), 80Mhz(u7), 20MHz(u8), 40MHz(u8), 80Mhz(u8)]
+rssicorrnorm6g_c0=1,0,0,-4,0,0,-2,0,0,0,0,0
+
+# These parameter are not required (seems obsolete), valid for fast AGC
+#rssi_delta_5gl=-6 4 -8 -8 -6 4 -8 -8 -6 4 -8 -8 -3 6 -3 -4 -3 6 -3 -4 -3 6 -3 -4
+#rssi_delta_5gml=-1 3 -1 -3 -1 3 -1 -3 -1 3 -1 -3 -1 2 0 -2 -1 2 0 -2 -1 2 0 -2
+#rssi_delta_5gmu=0 3 -1 -2 0 3 -1 -2 0 3 -1 -2 0 2 0 -2 0 2 0 -2 0 2 0 -2
+#rssi_delta_5gh=2 4 2 -1 2 4 2 -1 2 4 2 -1 0 0 2 -2 0 0 2 -2 0 0 2 -2
+#rssi_delta_6gunii5=-6 4 -8 -8 -6 4 -8 -8 -6 4 -8 -8 -3 6 -3 -4 -3 6 -3 -4 -3 6 -3 -4
+#rssi_delta_6gunii6=-1 3 -1 -3 -1 3 -1 -3 -1 3 -1 -3 -1 2 0 -2 -1 2 0 -2 -1 2 0 -2
+#rssi_delta_6gunii7=0 3 -1 -2 0 3 -1 -2 0 3 -1 -2 0 2 0 -2 0 2 0 -2 0 2 0 -2
+#rssi_delta_6gunii8=2 4 2 -1 2 4 2 -1 2 4 2 -1 0 0 2 -2 0 0 2 -2 0 0 2 -2
+rssi_cal_rev=1
+rxgaincal_rssical=1
+
+# Correction for low rssi region
+low_pwr_rssi_thresh_qdBm_5g=-334
+low_pwr_rssi_bias_5g_c0=-2,0,0,-8,0,0,-6,0,0,-8,0,0
+
+# Setting this to 255 to disable temp based compensation
+gain_cal_temp=25
+rxgain_tempcoeff2g_sub=32,32,32,32,32,32,32,32,32,32
+rxgain_tempcoeff5gl=28
+rxgain_tempcoeff5gml=24
+rxgain_tempcoeff5gmu=24
+rxgain_tempcoeff5gh=24
+rxgain_tempcoeff2g_sub_elnaoff=32,32,32,32,32,32,32,32,32,32
+rxgain_tempcoeff5gl_elnaoff=28
+rxgain_tempcoeff5gml_elnaoff=22
+rxgain_tempcoeff5gmu_elnaoff=22
+rxgain_tempcoeff5gh_elnaoff=22
+rxgain_tempcoeff6g_unii5=24
+rxgain_tempcoeff6g_unii6=24
+rxgain_tempcoeff6g_unii7=28
+rxgain_tempcoeff6g_unii8=34
+
+# Each nibble represent 2G channel from 1 to 14. LSB 3 bits specify group number (i.e. 0 to 4), MSB specify if ch used for calibration
+rssi_cal_freq_grp_2g= 0x08,0x01,0x91,0x2a,0x23,0xb3,0xc4
+rssi_delta_2gb0=0,0,0,0
+rssi_delta_2gb1=0,0,0,0
+rssi_delta_2gb2=0,0,0,0
+rssi_delta_2gb3=0,0,0,0
+rssi_delta_2gb4=0,0,0,0
+# ==== RSSI related parametes end ==============================================================
+
+#Two range TSSI
+tworangetssi2g=0
+tworangetssi5g=0
+# NOTE :================================================================================
+# To run TPC with Two Range TSSI ,set  tworangetssi2g = 1 and lowpowerrange2g = 0
+# To run TPC with Single Range TSSI, set tworangetssi2g = 0
+# To run TPC please READ instructions near pa2ga0 and pa2ga1 as well
+# To generate PA params for Low Range set  tworangetssi2g = 0 and lowpowerrange2g to 1
+# To generate PA params for High Range set  tworangetssi2g = 1 and lowpowerrange2g to 1
+# ======================================================================================
+#lowpowerrange2g=0
+#lowpowerrange5g=0
+
+#Related to FW Download. Host may use this
+nocrc=1
+#FIXME:4369 otpimagesize? Check with Rama
+otpimagesize=502
+
+xtalfreq=37400
+
+txchain=1
+rxchain=1
+
+cckdigfilttype=3
+cck_txgain_offsetval=0x18
+
+#bit mask for slice capability bit 0:2G bit 1:5G
+bandcap=2
+
+
+#FDSS Related
+fdss_level_5g=9
+fdss_interp_en=0
+fdss_level_2g=4
+
+#FIXME: fdss level for 6G made same as 5G for now
+fdss_level_6g=9
+
+#LPB related : FIXME Enable later
+leg_preamble_boost=12,12,0
+lpb_comp=10
+
+#PAPRR Related
+paprdis=0
+paprrmcsgain2g=130,130,130,129,128,0,0,0,0,0,0,0
+paprrmcsgamma2g=550,550,550,650,700,-1,-1,-1,-1,-1,-1,-1
+paprrmcsgain5g20=130,130,130,129,128,0,0,0,0,0,0,0
+paprrmcsgamma5g20=500,500,550,650,700,-1,-1,-1,-1,-1,-1,-1
+
+#PAPR params for 6G
+#FIXME: papr params 6G made same as 5G for now
+paprrmcsgain6g20=130,130,130,129,128,0,0,0,0,0,0,0
+paprrmcsgamma6g20=500,500,550,650,700,-1,-1,-1,-1,-1,-1,-1
+
+#Tempsense Related
+tempthresh=255
+tempoffset=255
+rawtempsense=0x1ff
+phycal_tempdelta=15
+temps_period=15
+temps_hysteresis=15
+
+#------------- TSSI Related -------------
+tssipos2g=1
+tssipos5g=1
+
+AvVmid_c0=6,75,5,93,5,93,5,93,5,93,5,90,5,90,5,90,5,90
+
+low_adc_rate_en=1
+#limit Tx gain index
+txidxcap2g=10
+txidxcap5g=10
+txidxcap6g=10
+
+# Single RANGE TPC/TSSI
+#2G OFDM
+#pa2ga0=0,8015,-676
+pa2ga0=-156,6167,-696
+#2G CCK
+#pa2gccka0=0,8015,-676
+pa2gccka0=-110,7093,-749
+#5G channels:36 to 48,52 to 64,100 to 144,149 to 165
+#pa5ga0=-94,7015,-664,-88,7081,-659,-135,6774,-703,-110,7005,-685
+pa5ga0=-198,5370,-617,-211,5672,-695,-191,6112,-720,-170,5778,-646
+#PA Params 6G UNII-5,6,7,8
+#pa6ga0=-157,6659,-714,-156,6675,-721,-145,6830,-731,-162,6499,-716
+pa6ga0=-137,6057,-650,-147,6141,-680,-119,6556,-698,-136,6816,-749
+
+
+# Max power and offsets
+maxp2ga0=86
+maxp5ga0=70,70,70,70
+#Max Power on 6G UNII-5/6 and UNII-7/8
+maxp6ga0=70,70
+
+subband5gver=0x4
+paparambwver=3
+cckpwroffset0=0
+
+# PD offsets for 2G,5G,6G
+# 2G power offset per channel
+powoffs2gtna0=0,0,0,0,0,0,0,0,0,0,0,0,0,0
+# 5G power offset per channel for band edge channel
+powoffs5g20mtna0=0,0,0,0,0,0,0
+pdoffset20ma0=0x0000
+pdoffset6g20ma0=0x0000
+pdoffset6g20ma0_group1=0x0000
+
+cckbw202gpo=0x2220
+cckbw20ul2gpo=0x2220
+mcsbw202gpo=0xaa886666
+
+dot11agofdmhrbw202gpo=0x6666
+ofdmlrbw202gpo=0x0066
+mcsbw205glpo=0x66400000
+mcsbw205gmpo=0x66400000
+mcsbw205ghpo=0x66400000
+
+# ppr offsets for UNII-5/6 of 6GHz band
+mcsbw206glpo=0x66400000
+
+# ppr offsets for UNII-7/8 of 6GHz band
+mcsbw206gmpo=0x66400000
+
+mcs1024qam2gpo=0xffcc
+mcs1024qam5glpo=0xffffcc
+mcs1024qam5gmpo=0xffffcc
+mcs1024qam5ghpo=0xffffcc
+mcs1024qam5gx1po=0xffffcc
+mcs1024qam5gx2po=0xffffcc
+mcs8poexp=0
+mcs9poexp=0
+mcs10poexp=0
+mcs11poexp=0
+# 1024QAM rates' offset for 6GHz UNII-5/6
+mcs1024qam6glpo=0xffffcc
+# 1024QAM rates' offset for 6GHz UNII-7/8
+mcs1024qam6gmpo=0xffffcc
+
+#UL-OFDMA PPR's accros RU's
+#currently programmed same PPR accross RU's
+#across QAM's the PPR are same b/w SU and RU
+#each RU PPR is grouped with 5 bits
+ruppr2g20bpska0=0x10842
+ruppr2g20qpska0=0x10842
+ruppr2g20qam16a0=0x10842
+ruppr2g20qam64a0=0x294A5
+ruppr2g20qam256a0=0x42108
+ruppr2g20qam1024a0=0x5294A
+ruppr5g20bpska0=0x0
+ruppr5g20qpska0=0x0
+ruppr5g20qam16a0=0x10842
+ruppr5g20qam64a0=0x10842
+ruppr5g20qam256a0=0x18c63
+ruppr5g20qam1024a0=0x294A5
+
+# OLPC Related
+disable_olpc=0
+olpc_thresh5g=60
+olpc_anchor5g=64
+disable_olpc_2g=0
+olpc_thresh2g=56
+olpc_anchor2g=60
+#FIXME: olpc params 6G made same as 5G for now
+olpc_thresh6g=60
+olpc_anchor6g=64
+
+#LTE Coex Related
+ltecxmux=0
+ltecxpadnum=0x0504
+ltecxfnsel=0x44
+ltecxgcigpio=0x04
+#OOB params
+#device_wake_opt=1
+#host_wake_opt=0
+
+# SWCTRL Related
+swctrlmap_5g=0x08080808,0x02020202,0x08080808,0x010008,0x00f
+swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x000
+fem_table_init_val=0x06060606,0x08080808
+fem_table_init_val_ext=0x00000000,0x00000000
+
+swctrlmap_2g=0x06060606,0x08080808,0x06060606,0x010008,0x10f
+swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x000
+
+clb2gslice0core0=0xd
+clb5gslice0core0=0x2
+#For TDM coex use the following
+btc_prisel_ant_mask=0x0
+clb_swctrl_smask_ant0=0x3ff
+# 2 Ant hyb/par following comment above
+#btc_prisel_ant_mask=0x3
+#clb_swctrl_smask_ant0=0x34f
+muxenab=0x10
+
+#BT Coex 1:TDM
+btc_mode=1
+
+# --- PAPD Cal related params ----
+# 0:NBPAPD 1:WBPAPD
+txwbpapden=1
+# NB PAPD Cal params
+# 0x5Gc02Gc0
+nb_eps_offset=0x01dd01e3
+nb_bbmult=0x5550
+nb_papdcalidx=0x050a
+nb_txattn=0x0000
+nb_rxattn=0x0000
+papdgainctrl2g=0
+papdgainctrl5g=0
+pacalshift2g=5
+pacalshift5g=4
+eps_stopidx=63
+# two-core specific variables for each of UNII-5/6/7/8 bands
+# u5c0,u6c0,u7c0,u8c0
+nb_txattn_6g=0,0,0,0
+nb_rxattn_6g=0,0,0,0
+nb_papdcalidx_6g=10,10,10,10
+nb_bbmult_6g=80,80,80,80
+nb_eps_offset_6g=475,475,475,475
+papdgainctrl6g=0
+pacalshift6g20=3,4,4,4
+
+# WB papd cal params
+# c02g,c05g20
+wb_txattn=0,1
+wb_rxattn=0,0
+wb_tia_gain_mode=2,2
+wb_eps_offset=474,462
+wb_papdcalidx=10,5
+wb_bbmult=64,90
+wb_calref_db=23,24
+wb_txbuf_offset=33,32
+wb_frac_del=255,255
+wb_g_frac_bits=10,10
+
+# WB 6G cal params
+# u5c0,u6c0,u7c0,u8c0
+wb_txattn_6g20=1,1,1,1
+wb_rxattn_6g20=0,0,0,0
+wb_tia_gain_mode_6g20=4,4,2,5
+wb_papdcalidx_6g20=10,10,5,30
+wb_bbmult_6g20=70,80,80,86
+wb_eps_offset_6g20=470,468,463,471
+wb_calref_db_6g20=24,24,24,28
+
+
+#2nd LUT parameters
+wb_multipapd_en=0
+wb_PapdLutSel_idx_6g20=42,42,42,42
+wb_eps_index_offset_6g20=5,5,5,5
+wb_papdcalidx_6g20_lut1=10,10,10,10
+wb_bbmult_6g20_lut1=66,70,74,74
+wb_calref_db_6g20_lut1=26,26,26,26
+
+# WBPAPD gain control params
+wb_gainctrl_nvram_en=1
+wb_target_tssi_2g20=200
+wb_target_tssi_5g20=210,210,210,150
+wb_target_tssi_6g20=75,71,100,-45
+wb_fudge_factor_2g5g=1,0,-1,-1,-1
+
+# 2g/5G 2nd PAPD LUT parameters applicable for -40degc
+wb_eps_offset_lut1=22,10
+wb_calref_db_lut1=23,19
+wb_papdcalidx_lut1=10,10
+wb_bbmult_lut1=25,40
+wb_PapdLutSel_idx_2g5g=53,52
+
+# energy detect threshold
+ed_thresh2g=-65
+ed_thresh5g=-68
+ed_thresh6g=-78
+# energy detect threshold for EU
+eu_edthresh2g=-65
+eu_edthresh5g=-68
+eu_edthresh6g=-78
+
+btldopu=0
+
+#rpcal coef for imptxbf
+rpcal2g=0
+rpcal5gb0=238
+rpcal5gb1=228
+rpcal5gb2=222
+rpcal5gb3=229
+
+#Enable LHL PS mode
+lhl_ps_mode=3
+
+#SR related params
+#The min resource state during sleep
+rmin=0x1
+#disable sr topoff
+lpflags=0
+#disable fastlpo setting
+fastlpo_pcie_dis=0
+fastlpo_dis=0
+
+#PALDO settings 0=3.3 1=3.35 2=3.41 3=3.46 4=2.86, 5=2.97 6=3.08, 7=3.19
+#paldo3p3_voltage=0
+
+#2G lowpwr settings 0=TOT 1=setting1 2=setting2 3=settingHE(lowpwr)
+#ipa2glowpwr=3
+
+#temperature throttling
+# Currently tvpm is not part of H1 build, disable for initial BU
+tvpm=1
+tvpm_txc_txdc=105,15
+tvpm_txc_txdc_lowlimit=1
+tvpm_txc_txdc_insert=0,0
+tvpm_monitor_period=3
+#temperature throttling, aggressive setting
+tvpm_txc_txdc_burst=110,20,5
+
+##Dynamic Desense Params for 2 ant hybrid coex
+#btcdyn_flags=3
+#btcdyn_dflt_dsns_level=0
+#btcdyn_low_dsns_level=1
+#btcdyn_mid_dsns_level=2
+#btcdyn_high_dsns_level=4
+#btcdyn_default_btc_mode=5
+#btcdyn_dsns_rows=2
+#btcdyn_dsns_row1=5,-4,0,-50,-70
+#btcdyn_dsns_row0=5,12,0,-50,-65
+
+ppr_hitemp_offset=70,10
+#            idx 0: PPR temp thresh, default 150
+#            idx 1: PPR temp thresh hysteresis, default 15
+cckbw202gpo_ht=0x6666
+#            CCK high temp offset, 0.5dBm/step, rate(11,5.5,2,1Mbps)
+ofdmbw202gpo_ht=0x66666666
+#        2G OFDM temp offset, 0.5dBm/step, rate(54,48,36,24,18,12,9,6Mbps)
+mcsbw202gpo_ht=0x66666666
+#        2G BW20 VHT/HT temp offset, 0.5dBm/step, rate(C9,C8,M7,M6,M5,M4,M3,M2-0)
+mcsbw202gpo_1024qam_ht=0x66
+#        2G BW20 HE/VHT temp offset, 0.5dBm/step, rate(C11,C10)
+ofdmbw205gpo_ht=0x66666666
+#        5G OFDM temp offset, 0.5dBm/step, rate(54,48,36,24,18,12,9,6Mbps)
+mcsbw205gpo_ht=0x66666666
+#        5G BW20 HE/VHT/HT temp offset, 0.5dBm/step, rate(C9,C8,M7,M6,M5,M4,M3,M2-0)
+mcsbw205gpo_1024qam_ht=0x66
+#        5G BW20 HE/VHT temp offset, 0.5dBm/step, rate(C11,C10)
+ofdmbw206gpo_ht=0x66666666
+#        6G OFDM temp offset, 0.5dBm/step, rate(54,48,36,24,18,12,9,6Mbps)
+mcsbw206gpo_ht=0x66666666
+#        6G BW20 HE/VHT/HT temp offset, 0.5dBm/step, rate(C9,C8,M7,M6,M5,M4,M3,M2-0)
+mcsbw206gpo_1024qam_ht=0x66
+#        6G BW20 HE/VHT temp offset, 0.5dBm/step, rate(C11,C10)
+
+# SWDIV related
+swdiv_en=0 #To enable SW-DIV feature
+swdiv_gpio=0
+swdiv_swctrl_en=2
+swdiv_swctrl_ant0=0
+swdiv_swctrl_ant1=1
+swdiv_antmap2g_main=1
+swdiv_antmap5g_main=1
+
+swdiv_snrlim=290 #Only enable sw_div if the snr on present antenna is less than 290/8=36.25
+swdiv_thresh=2000 #No.of rxpkts threshold
+swdiv_snrthresh=24 #Difference between antenna's snr is greater than 24/8=3dB, then shift the antennas
+swdiv_timeon=10
+swdiv_timeoff=1
+swdiv_snr2g20=232
+swdiv_snr2g40=257
+swdiv_snr5g20=232
+swdiv_snr5g40=312
+swdiv_snr5g80=296
+
+swdiv_ap_dead_check=0 #Enable sending of null frames at a periodicity of 1 sec to check whether the present antenna is dead
+swdiv_ap_div=0 #Enabling ap_diversity
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.10.bb
index bbb5f047e..c31bd93a4 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.10.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.10.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2024 Digi International Inc.
+# Copyright (C) 2024,2025, Digi International Inc.
 
 require u-boot-dey.inc
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb
index d33623c60..0a9c70311 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2024, Digi International Inc.
+# Copyright (C) 2024,2025, Digi International Inc.
 
 require u-boot-dey.inc
 
diff --git a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2024.04.bb b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2024.04.bb
deleted file mode 100644
index 39000e5b5..000000000
--- a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2024.04.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (C) 2024, Digi International Inc.
-
-require nativesdk-trustfence-sign-tools_git.bb
-
-SRCBRANCH = "v2024.04/master"
-SRCREV = "${AUTOREV}"
diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2024.04.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2024.04.bb
deleted file mode 100644
index 646a7a217..000000000
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2024.04.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (C) 2024, Digi International Inc.
-
-require trustfence-sign-tools-native_git.bb
-
-SRCBRANCH = "v2024.04/master"
-SRCREV = "${AUTOREV}"
diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc
index 084fd4d3f..e62911a62 100644
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc
@@ -1,10 +1,10 @@
-# Copyright (C) 2017-2023, Digi International Inc.
+# Copyright (C) 2017-2025, Digi International Inc.
 
 SUMMARY = "TrustFence signing and encryption scripts"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
-SRCBRANCH = "v2020.04/master"
+SRCBRANCH = "v2024.04/master"
 SRCREV = "${AUTOREV}"
 
 S = "${WORKDIR}"
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
index 80225ca58..160af3b33 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2023, Digi International Inc.
+# Copyright (C) 2016-2025, Digi International Inc.
 
 SUMMARY = "Qualcomm's wireless driver for qca65xx"
 DESCRIPTION = "qcacld-2.0 module"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
index 7ed85462a..0a8abdd0a 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
@@ -66,4 +66,4 @@ kernel_do_deploy:append:ccmp1() {
 	fi
 }
 
-COMPATIBLE_MACHINE = "(ccimx6|ccimx8m|ccmp1)"
+COMPATIBLE_MACHINE = "(ccimx6$|ccimx8m|ccmp1)"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb
index 88fddfdae..46ac98651 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2024, Digi International Inc.
+# Copyright (C) 2024,2025 Digi International Inc.
 
 require recipes-kernel/linux/linux-dey.inc
 
diff --git a/meta-digi-arm/wic/ccmp2-1GB.wks.in b/meta-digi-arm/wic/ccmp2-1GB.wks.in
index 54dbbaed4..1e30aa283 100644
--- a/meta-digi-arm/wic/ccmp2-1GB.wks.in
+++ b/meta-digi-arm/wic/ccmp2-1GB.wks.in
@@ -1,27 +1,28 @@
 # short-description: Create SD card image with a boot partition (1GB)
-# long-description: Creates a partitioned SD card image (1GB)
+# short-description: Create SD card image with a boot partition (2GB)
+# long-description: Creates a partitioned SD card image (2GB)
 #
-#  - -------- ------------- ------ ------ ------------ -------- --------- ------------------------
-# | | 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
+#  - -------- ------------- ------ ------ ------------ -------- ---------- --------- ------
+# | | TFA(2) | Metadata(2) | FIPA | FIPB | U-BOOT ENV | linux  |  rootfs  | safe(2) | data |
+#  - -------- ------------- ------ ------ ------------ -------- ---------- ----------------
+# ^ ^        ^             ^      ^      ^            ^        ^          ^         ^      ^
+# | |        |             |      |      |            |        |          |         |      |
+# 0 17kB   542kB        1.06MB  5.26MB 9.45MB      9.97MB    77.1MB    1577.1MB  1578MB  1706MB
 #
 # 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
+part fsbla1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbla1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/tf-a-${MACHINE}-optee-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}/tf-a-${MACHINE}-optee-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
+part metadata1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/metadata-${MACHINE}.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}/metadata-${MACHINE}.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
+part fip-a   --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-a --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip-${MACHINE}-optee-sdcard.bin" --ondisk mmcblk --part-type ${DEVICE_TYPEUUID_FIP} --fixed-size 4096K --uuid ${DEVICE_PARTUUID_FIP_A}
+part fip-b   --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-b --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip-${MACHINE}-optee-sdcard.bin" --ondisk mmcblk --part-type ${DEVICE_TYPEUUID_FIP} --fixed-size 4096K --uuid ${DEVICE_PARTUUID_FIP_B}
 
 # U-BOOT env
 part u-boot-env --source empty --part-name=uboot-env --ondisk mmcblk --part-type 0x8301 --fixed-size 512K
@@ -30,7 +31,7 @@ part u-boot-env --source empty --part-name=uboot-env --ondisk mmcblk --part-type
 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
+part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 1500M --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
diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf
index 7357bbc30..8d95571d4 100644
--- a/meta-digi-dey/conf/distro/dey.conf
+++ b/meta-digi-dey/conf/distro/dey.conf
@@ -5,7 +5,7 @@ require include/time64.inc
 YOCTO_MAJOR = "5"
 YOCTO_MINOR = "0"
 DEY_RELEASE = "1"
-DEY_BUILD = "1"
+DEY_BUILD = "3"
 
 # Firmware version of the system.
 DEY_FIRMWARE_VERSION ?= "${YOCTO_MAJOR}.${YOCTO_MINOR}.${DEY_RELEASE}.${DEY_BUILD}"
@@ -44,7 +44,6 @@ INITRAMFS_IMAGE = '${@bb.utils.contains("KERNEL_IMAGETYPE", "fitImage", "${RECOV
 # DEY image features (alphabetical order)
 FEATURE_PACKAGES_dey-audio = "packagegroup-dey-audio"
 FEATURE_PACKAGES_dey-bluetooth = "packagegroup-dey-bluetooth"
-FEATURE_PACKAGES_dey-crank = "packagegroup-dey-crank"
 FEATURE_PACKAGES_dey-debug = "packagegroup-dey-debug"
 FEATURE_PACKAGES_dey-examples = "packagegroup-dey-examples"
 FEATURE_PACKAGES_dey-gstreamer = "packagegroup-dey-gstreamer"
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb
index f15e969ff..eccae3d1a 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb
@@ -22,6 +22,7 @@ MACHINE_GSTREAMER_1_0_PKGS:ccimx6ul = " \
     gstreamer1.0-plugins-base-typefindfunctions \
     gstreamer1.0-plugins-base-videoconvertscale \
     gstreamer1.0-plugins-base-volume \
+    gstreamer1.0-plugins-good-autodetect \
     gstreamer1.0-plugins-good-pulseaudio \
     gstreamer1.0-plugins-good-video4linux2 \
     gstreamer1.0-plugins-good-videofilter \
diff --git a/meta-digi-dey/dynamic-layers/imx-machine-learning/recipes-libraries/eiq-examples/eiq-examples/0004-use-local-copy-of-ssd_mobilenet_v1_quant-model.patch b/meta-digi-dey/dynamic-layers/imx-machine-learning/recipes-libraries/eiq-examples/eiq-examples/0004-use-local-copy-of-ssd_mobilenet_v1_quant-model.patch
new file mode 100644
index 000000000..136eaa26a
--- /dev/null
+++ b/meta-digi-dey/dynamic-layers/imx-machine-learning/recipes-libraries/eiq-examples/eiq-examples/0004-use-local-copy-of-ssd_mobilenet_v1_quant-model.patch
@@ -0,0 +1,29 @@
+From: Isaac Hermida <isaac.hermida@digi.com>
+Date: Tue, 25 Feb 2025 12:32:45 +0000
+Subject: [PATCH] use local copy of ssd_mobilenet_v1_quant model
+
+This model is broken, and the Vela conversion is failing.
+Until it is fixed, use a locally working copy.
+
+Signed-off-by: Isaac Hermida <isaac.hermida@digi.com>
+---
+ download_models.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/download_models.py b/download_models.py
+index ba1cce726e25..411538a19662 100644
+--- a/download_models.py
++++ b/download_models.py
+@@ -67,9 +67,9 @@ def download_all_models(model_dir, vela_dir):
+ 
+     #Download object detection model
+     #https://www.tensorflow.org/
+-    url = 'https://storage.googleapis.com/tfhub-lite-models/tensorflow/lite-model/ssd_mobilenet_v1/1/metadata/2.tflite'
+-    path = os.path.join(model_dir, 'ssd_mobilenet_v1_quant.tflite')
+-    download_file('object detection', url, path)
++    # url = 'https://storage.googleapis.com/tfhub-lite-models/tensorflow/lite-model/ssd_mobilenet_v1/1/metadata/2.tflite'
++    # path = os.path.join(model_dir, 'ssd_mobilenet_v1_quant.tflite')
++    # download_file('object detection', url, path)
+ 
+     #Download image classification model
+     #https://www.tensorflow.org/
diff --git a/meta-digi-dey/dynamic-layers/imx-machine-learning/recipes-libraries/eiq-examples/eiq-examples/ssd_mobilenet_v1_quant.tflite b/meta-digi-dey/dynamic-layers/imx-machine-learning/recipes-libraries/eiq-examples/eiq-examples/ssd_mobilenet_v1_quant.tflite
new file mode 100644
index 000000000..be3b96b7c
Binary files /dev/null and b/meta-digi-dey/dynamic-layers/imx-machine-learning/recipes-libraries/eiq-examples/eiq-examples/ssd_mobilenet_v1_quant.tflite differ
diff --git a/meta-digi-dey/dynamic-layers/imx-machine-learning/recipes-libraries/eiq-examples/eiq-examples/ssd_mobilenet_v1_quant_vela.tflite b/meta-digi-dey/dynamic-layers/imx-machine-learning/recipes-libraries/eiq-examples/eiq-examples/ssd_mobilenet_v1_quant_vela.tflite
new file mode 100644
index 000000000..f3c42c618
Binary files /dev/null and b/meta-digi-dey/dynamic-layers/imx-machine-learning/recipes-libraries/eiq-examples/eiq-examples/ssd_mobilenet_v1_quant_vela.tflite differ
diff --git a/meta-digi-dey/dynamic-layers/imx-machine-learning/recipes-libraries/eiq-examples/eiq-examples_git.bbappend b/meta-digi-dey/dynamic-layers/imx-machine-learning/recipes-libraries/eiq-examples/eiq-examples_git.bbappend
index 6d2fbbc32..c6964f1fb 100644
--- a/meta-digi-dey/dynamic-layers/imx-machine-learning/recipes-libraries/eiq-examples/eiq-examples_git.bbappend
+++ b/meta-digi-dey/dynamic-layers/imx-machine-learning/recipes-libraries/eiq-examples/eiq-examples_git.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2024, Digi International Inc.
+# Copyright (C) 2024,2025, Digi International Inc.
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
@@ -12,6 +12,9 @@ SRC_URI += " \
     file://0001-Customize-EiQ-demos.patch \
     file://0002-improvements-capture-x-windows-and-increase-resoluti.patch \
     file://0003-check-vela-return-code.patch \
+    file://0004-use-local-copy-of-ssd_mobilenet_v1_quant-model.patch \
+    file://ssd_mobilenet_v1_quant.tflite \
+    file://ssd_mobilenet_v1_quant_vela.tflite \
     file://scripts/launch_eiq_demo.sh \
     file://service/eiqdemo.service \
 "
@@ -43,12 +46,14 @@ do_install () {
     for archive in "${S}/${MODELS_DIR}"/*.tflite; do
         cp "${archive}" "${D}${bindir}/${PN}-${PV}/${MODELS_DIR}"
     done
+    cp ${WORKDIR}/ssd_mobilenet_v1_quant.tflite "${D}${bindir}/${PN}-${PV}/${MODELS_DIR}"
 
     # Install the transformed Vela models.
     install -d "${D}${bindir}/${PN}-${PV}/${VELA_MODELS_DIR}"
     for archive in "${S}/${VELA_MODELS_DIR}"/*.tflite; do
         cp "${archive}" "${D}${bindir}/${PN}-${PV}/${VELA_MODELS_DIR}"
     done
+    cp ${WORKDIR}/ssd_mobilenet_v1_quant_vela.tflite "${D}${bindir}/${PN}-${PV}/${VELA_MODELS_DIR}"
 
     # Install the launch script.
     install -d ${D}${sysconfdir}/demos/scripts
diff --git a/meta-digi-dey/recipes-core/images/dey-image-crank.bb b/meta-digi-dey/recipes-core/images/dey-image-crank.bb
deleted file mode 100644
index 4b8e3b56c..000000000
--- a/meta-digi-dey/recipes-core/images/dey-image-crank.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2022,2023, Digi International Inc.
-
-require dey-image-graphical.inc
-
-DESCRIPTION = "DEY image including Crank Storyboard engine and demo packages"
-
-GRAPHICAL_CORE = "crank"
-
-# Remove X11 image features
-IMAGE_FEATURES:remove:ccimx6ul = "x11-base x11-sato"
-
-# Reduce the rootfs size to fit in the internal storage
-IMAGE_FEATURES:remove:ccmp15 = "dey-gstreamer"
diff --git a/meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo-init b/meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo-init
deleted file mode 100644
index 5fbd42ad1..000000000
--- a/meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo-init
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-#===============================================================================
-#
-#  Copyright (C) 2022, 2023 by Digi International Inc.
-#  All rights reserved.
-#
-#  This program is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License version 2 as published by
-#  the Free Software Foundation.
-#
-#
-#  !Description: Initialize Crank demo
-#
-#===============================================================================
-
-readonly DEMO="##CRANK_DEMO_PATH##"
-readonly DEMO_DISPLAY="##CRANK_DEMO_DISPLAY##"
-readonly DEMO_OPTS="##CRANK_DEMO_OPTIONS##"
-readonly DEMO_ENV="##CRANK_DEMO_ENV##"
-readonly SB_LAUNCHER="sb-launcher"
-readonly SB_LAUNCHER_SCRIPT="/usr/bin/${SB_LAUNCHER}"
-readonly CRANK_DEMO="crank-demo"
-readonly PID_FILE="/run/${CRANK_DEMO}.pid"
-
-[ -f "/etc/profile.d/tslib.sh" ] && . /etc/profile.d/tslib.sh
-
-log() {
-	if type "systemd-cat" >/dev/null 2>/dev/null; then
-		systemd-cat -p "${1}" -t "${CRANK_DEMO}" printf "%s" "${2}"
-	fi
-	logger -p "${1}" -t "${CRANK_DEMO}" "${2}"
-}
-
-get_crank_demo_pid() {
-	local pid="$(pgrep -f ${DEMO})"
-
-	[ -n "${pid}" ] && { echo "${pid}"; return 0; }
-
-	return 1
-}
-
-check_is_running() {
-	local pid
-
-	if [ -s "${PID_FILE}" ]; then
-		pid="$(cat ${PID_FILE})"
-	else
-		pid="$(get_crank_demo_pid)"
-		echo "${pid}" > ${PID_FILE}
-	fi
-
-	if [ "${pid}" ]; then
-		kill -0 "${pid}" >/dev/null 2>&1 && return 0
-	fi
-
-	rm -f "${PID_FILE}"
-
-	return 1
-}
-
-wait_for_wayland() {
-	local count=20
-	local wayland_socket="/run/user/0/${DEMO_DISPLAY}"
-
-	while [ ! -S "${wayland_socket}" ]; do
-		sleep 1
-		count=$((count-1))
-		if [ "${count}" = 0 ]; then
-			return 1
-		fi
-	done
-	return 0
-}
-
-stop() {
-	check_is_running || return
-
-	local pid="$(cat ${PID_FILE})"
-	kill -TERM "${pid}" >/dev/null 2>&1
-
-	local STOP_TIMEOUT="5"
-	for i in $(seq ${STOP_TIMEOUT}); do
-		check_is_running || { log info "stopped"; break; }
-		if [ "${i}" -eq ${STOP_TIMEOUT} ]; then
-			log warning "stop: ${CRANK_DEMO} did not stop gracefully"
-			kill -KILL "${pid}" >/dev/null 2>&1
-		fi
-		sleep 1
-	done
-}
-
-start() {
-	check_is_running && { log warning "start: ${CRANK_DEMO} ALREADY running"; exit 0; }
-
-	[ -d "/usr/share/wayland" ] && wait_for_wayland
-	env ${DEMO_ENV} ${SB_LAUNCHER_SCRIPT} ${DEMO_OPTS} ${DEMO} >/dev/null 2>&1 &
-	if [ $? -eq 0 ]; then
-		echo $! > ${PID_FILE}
-		log info "$(cat ${PID_FILE})"
-		log info "started"
-	fi
-}
-
-case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	restart)
-		stop
-		sleep 1
-		start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-		;;
-esac
diff --git a/meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo.service b/meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo.service
deleted file mode 100644
index f33491cfa..000000000
--- a/meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Crank Software demo
-Documentation=https://www.cranksoftware.com/
-
-# Make sure we are started after graphic service is available
-After=##WESTON_SERVICE##
-Requires=##WESTON_SERVICE##
-
-[Service]
-Type=forking
-PIDFile=/run/crank-demo.pid
-ExecStart=/etc/crank-demo start
-ExecStop=/etc/crank-demo stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-digi-dey/recipes-crank/crank-demos/crank-demos_7.2.bb b/meta-digi-dey/recipes-crank/crank-demos/crank-demos_7.2.bb
deleted file mode 100644
index 88fcbc3d0..000000000
--- a/meta-digi-dey/recipes-crank/crank-demos/crank-demos_7.2.bb
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright (C) 2022-2024, Digi International Inc.
-
-SUMMARY = "Crank Demo"
-HOMEPAGE = "https://www.cranksoftware.com/"
-LICENSE = "CLOSED"
-
-DEPENDS = "crank-sbengine"
-
-SRC_URI = " \
-    http:///not/exist/crank-demos-${PV}.tar.gz \
-    file://crank-demo.service \
-    file://crank-demo-init \
-"
-SRC_URI[sha256sum] = "90a7fc258cdaa5f9afcf57224da8bbc5a330b957db88335f555369123a1432ab"
-
-WESTON_SERVICE ?= "weston.service"
-WESTON_SERVICE:ccmp15 ?= "weston-launch.service"
-
-CRANK_DEMOS_TARBALL_PATH ?= ""
-CRANK_DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\$\{DEMO_DISPLAY\}"
-CRANK_DEMO_ENV:ccimx6ul ?= ""
-CRANK_DEMO_OPTIONS ?= "-orender_mgr,multisample=0"
-CRANK_DEMO_OPTIONS:ccimx6ul ?= "-orender_mgr,multisample=0 -odev-input,mouse=/dev/input/mouse0 -oscreen_mgr,swcursor"
-CRANK_DEMO_PATH ?= "${datadir}/crank/apps/OpenGL_WideScreen/1280x720.gapp"
-
-# The tarball is only available for downloading after registration, so provide
-# a PREMIRROR to a local directory that can be configured in the project's
-# local.conf file using CRANK_DEMOS_TARBALL_PATH variable.
-python() {
-    crank_demos_tarball_path = d.getVar('CRANK_DEMOS_TARBALL_PATH')
-    if crank_demos_tarball_path:
-        premirrors = d.getVar('PREMIRRORS')
-        d.setVar('PREMIRRORS', "http:///not/exist/crank-demos-.* %s \\n %s" % (crank_demos_tarball_path, premirrors))
-    crank_demos_tarball_sha256 = d.getVar('CRANK_DEMOS_TARBALL_SHA256')
-    if crank_demos_tarball_sha256:
-        d.setVarFlag("SRC_URI", "sha256sum", crank_demos_tarball_sha256)
-}
-
-inherit systemd update-rc.d
-
-# Disable tasks not needed for the binary package
-do_configure[noexec] = "1"
-
-do_compile () {
-	for f in ${S}/*; do
-		if [ -d "${f}/source_code" ]; then
-			oe_runmake -C "${f}/source_code"
-		fi
-	done
-}
-
-do_install () {
-	install -d -m 0755 ${D}${datadir}/crank/apps
-
-	# Install Crank demos
-	tar --no-same-owner --exclude='EULA.pdf' --exclude='*/source_code' -cpf - -C ${S} . \
-		| tar --no-same-owner -xpf - -C ${D}${datadir}/crank/apps
-
-	# Install required binaries
-	for f in ${S}/*; do
-		if [ -d "${f}/source_code" ]; then
-			oe_runmake DESTDIR=${D}${datadir}/crank/apps/$(basename ${f}) -C "${f}/source_code" install
-		fi
-	done
-
-	# Install systemd service
-	if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-		# Install systemd unit files
-		install -d ${D}${systemd_unitdir}/system
-		install -m 0644 ${WORKDIR}/crank-demo.service ${D}${systemd_unitdir}/system/
-		sed -i -e "s,##WESTON_SERVICE##,${WESTON_SERVICE},g" \
-		      "${D}${systemd_unitdir}/system/crank-demo.service"
-	fi
-
-	# Install wrapper bootscript to launch Crank demo on boot
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/crank-demo-init ${D}${sysconfdir}/crank-demo
-	sed -i -e "s@##CRANK_DEMO_PATH##@${CRANK_DEMO_PATH}@g" \
-	       -e "s@##CRANK_DEMO_OPTIONS##@${CRANK_DEMO_OPTIONS}@g" \
-	       -e "s@##CRANK_DEMO_ENV##@${CRANK_DEMO_ENV}@g" \
-	       -e "s@##CRANK_DEMO_DISPLAY##@${WAYLAND_DISPLAY}@g" \
-	       "${D}${sysconfdir}/crank-demo"
-	ln -sf ${sysconfdir}/crank-demo ${D}${sysconfdir}/init.d/crank-demo
-}
-
-FILES:${PN} = " \
-    ${datadir}/crank/apps/* \
-    ${sysconfdir}/crank-demo \
-    ${sysconfdir}/init.d/crank-demo \
-    ${systemd_unitdir}/system/crank-demo.service \
-"
-
-INITSCRIPT_NAME = "crank-demo"
-INITSCRIPT_PARAMS = "defaults 90 10"
-
-SYSTEMD_SERVICE:${PN} = "crank-demo.service"
-
-RDEPENDS:${PN} += "crank-sbengine"
diff --git a/meta-digi-dey/recipes-crank/crank-sbengine/crank-sbengine/sb-launcher b/meta-digi-dey/recipes-crank/crank-sbengine/crank-sbengine/sb-launcher
deleted file mode 100644
index 29a9b8a0e..000000000
--- a/meta-digi-dey/recipes-crank/crank-sbengine/crank-sbengine/sb-launcher
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-ENGINE="/usr/share/crank/sbengine"
-
-exec env LD_LIBRARY_PATH=${ENGINE}/lib SB_PLUGINS=${ENGINE}/plugins ${ENGINE}/bin/sbengine "$@"
diff --git a/meta-digi-dey/recipes-crank/crank-sbengine/crank-sbengine_7.2.bb b/meta-digi-dey/recipes-crank/crank-sbengine/crank-sbengine_7.2.bb
deleted file mode 100644
index deb465344..000000000
--- a/meta-digi-dey/recipes-crank/crank-sbengine/crank-sbengine_7.2.bb
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright (C) 2022, Digi International Inc.
-
-SUMMARY = "Crank Storyboard Engine"
-HOMEPAGE = "https://www.cranksoftware.com/"
-LICENSE = "CLOSED"
-
-SBENGINE_NAME:ccimx6ul = "linux-imx6yocto-armle-swrender-obj"
-SBENGINE_NAME:ccimx6 = "linux-imx6yocto-armle-opengles_2.0-obj"
-SBENGINE_NAME:ccimx8m = "linux-imx8yocto-armle-opengles_2.0-wayland-obj"
-SBENGINE_NAME:ccimx8x = "linux-imx8yocto-armle-opengles_2.0-wayland-obj"
-SBENGINE_NAME:ccmp15 = "linux-stmA5-armle-opengles_2.0-wayland-obj"
-
-SRC_URI = " \
-    http:///not/exist/crank-sbengine-${PV}.tar.gz \
-    file://sb-launcher \
-"
-SRC_URI[sha256sum] = "79c9162c401dd6282321361d51f15ccef1608da7cde9030c2b72b9573e826056"
-
-CRANK_ENGINE_TARBALL_PATH ?= ""
-
-# The tarball is only available for downloading after registration, so provide
-# a PREMIRROR to a local directory that can be configured in the project's
-# local.conf file using CRANK_ENGINE_TARBALL_PATH variable.
-python() {
-    crank_engine_tarball_path = d.getVar('CRANK_ENGINE_TARBALL_PATH')
-    if crank_engine_tarball_path:
-        premirrors = d.getVar('PREMIRRORS')
-        d.setVar('PREMIRRORS', "http:///not/exist/crank-sbengine-.* %s \\n %s" % (crank_engine_tarball_path, premirrors))
-    crank_engine_tarball_sha256 = d.getVar('CRANK_ENGINE_TARBALL_SHA256')
-    if crank_engine_tarball_sha256:
-        d.setVarFlag("SRC_URI", "sha256sum", crank_engine_tarball_sha256)
-}
-
-# Disable tasks not needed for the binary package
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install () {
-	# Install launcher script
-	install -d -m 0755 ${D}${bindir}
-	install -m 0755 ${WORKDIR}/sb-launcher ${D}${bindir}/sb-launcher
-
-	# Copy the engine
-	install -d -m 0755 ${D}${datadir}/crank/sbengine
-	cp -drf ${S}/${SBENGINE_NAME}/* ${D}${datadir}/crank/sbengine
-	chmod a+rx ${D}${datadir}/crank/sbengine/*
-}
-
-FILES:${PN} = " \
-    ${bindir}/* \
-    ${datadir}/crank/sbengine/* \
-"
-FILES:${PN}-staticdev += " ${datadir}/crank/sbengine/lib/libgreio.a"
-
-#
-# Disable failing QA checks:
-#
-#   Libraries inside /usr/share (datadir)
-#   ELF binaries has relocations in .text
-#
-INSANE_SKIP:${PN} += "libdir textrel"
-INSANE_SKIP:${PN}-dbg += "libdir"
-
-RDEPENDS:${PN} = " \
-    alsa-lib \
-    glib-2.0 \
-    gstreamer1.0 \
-    libgstapp-1.0 \
-    libxml2 \
-    zlib \
-"
-RDEPENDS:${PN}:append:ccimx6ul = " \
-    mtdev \
-    tslib \
-"
-RDEPENDS:${PN}:append:ccimx8m = " \
-    libegl-imx \
-    libgles2-imx \
-    wayland \
-"
-RDEPENDS:${PN}:append:ccimx8x = " \
-    libegl-imx \
-    libgles2-imx \
-    wayland \
-"
-RDEPENDS:${PN}:append:ccimx6 = " \
-    libegl-imx \
-    libgles2-imx \
-    mtdev \
-    tslib \
-"
-RDEPENDS:${PN}:append:ccmp15 = " \
-    libegl-gcnano \
-    libgles2-gcnano \
-    wayland \
-"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-digi-dey/recipes-crank/packagegroups/packagegroup-dey-crank.bb b/meta-digi-dey/recipes-crank/packagegroups/packagegroup-dey-crank.bb
deleted file mode 100644
index 6e9484de6..000000000
--- a/meta-digi-dey/recipes-crank/packagegroups/packagegroup-dey-crank.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (C) 2022, Digi International Inc.
-#
-SUMMARY = "Crank packagegroup for DEY image"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-inherit packagegroup
-
-# Include Crank engine and demos
-RDEPENDS:${PN} += " \
-    crank-demos \
-    crank-sbengine \
-"
diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb
index 461eda8d7..e89ef4ead 100644
--- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb
+++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2024, Digi International Inc.
+# Copyright (C) 2017-2025, Digi International Inc.
 
 SUMMARY = "Digi's ConnectCore Cloud services"
 SECTION = "libs"
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc
index 19e1bdfc8..1a6e439de 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2022, Digi International Inc.
+# Copyright (C) 2019-2025, Digi International Inc.
 
 SRCBRANCH = "master"
 SRCREV = "${AUTOREV}"
diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
index 92d03fb43..9eac671d1 100644
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022, Digi International Inc.
+# Copyright (C) 2017-2025, Digi International Inc.
 
 SUMMARY = "Digi APIX library"
 DESCRIPTION = "C library to access and manage your ConnectCore platform interfaces in an easy manner"
diff --git a/meta-digi-dey/recipes-digi/swu-images/dey-image-crank-swu.bb b/meta-digi-dey/recipes-digi/swu-images/dey-image-crank-swu.bb
deleted file mode 100644
index 5ac5a057f..000000000
--- a/meta-digi-dey/recipes-digi/swu-images/dey-image-crank-swu.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (C) 2022, Digi International Inc.
-
-require swu.inc
-
-# Remove X11 image features
-IMAGE_FEATURES:remove:ccimx6ul = "x11-base x11-sato"
-
-IMG_NAME = "${@get_baseimg_pn(d)}-${GRAPHICAL_BACKEND}"
diff --git a/sdk/build-github.sh b/sdk/build-github.sh
index 3840509ec..be51ffa75 100755
--- a/sdk/build-github.sh
+++ b/sdk/build-github.sh
@@ -105,7 +105,6 @@ purge_sstate() {
 		packagegroup-dey-audio \
 		packagegroup-dey-bluetooth \
 		packagegroup-dey-core \
-		packagegroup-dey-crank \
 		packagegroup-dey-debug \
 		packagegroup-dey-examples \
 		packagegroup-dey-gstreamer \
diff --git a/sdk/build.sh b/sdk/build.sh
index 920512f9e..3ebe57cce 100755
--- a/sdk/build.sh
+++ b/sdk/build.sh
@@ -115,7 +115,6 @@ purge_sstate() {
 		packagegroup-dey-audio \
 		packagegroup-dey-bluetooth \
 		packagegroup-dey-core \
-		packagegroup-dey-crank \
 		packagegroup-dey-debug \
 		packagegroup-dey-examples \
 		packagegroup-dey-gstreamer \
@@ -172,17 +171,17 @@ while read -r _pl _tgt; do
 	# the fly with underscores.
 	eval "${_pl//-/_}_tgt=\"${_tgt//,/ }\""
 done<<-_EOF_
-	ccimx8mm-dvk         dey-image-qt,dey-image-crank,dey-image-webkit,dey-image-lvgl
-	ccimx8mn-dvk         dey-image-qt,dey-image-crank,dey-image-webkit,dey-image-lvgl
-	ccimx8x-sbc-pro      dey-image-qt,dey-image-crank,dey-image-webkit,dey-image-lvgl
+	ccimx8mm-dvk         dey-image-qt,dey-image-webkit,dey-image-lvgl
+	ccimx8mn-dvk         dey-image-qt,dey-image-webkit,dey-image-lvgl
+	ccimx8x-sbc-pro      dey-image-qt,dey-image-webkit,dey-image-lvgl
 	ccimx8x-sbc-express  dey-image-qt
 	ccimx6qpsbc          dey-image-qt,dey-image-webkit,dey-image-lvgl
 	ccimx6sbc            dey-image-qt,dey-image-webkit,dey-image-lvgl
-	ccimx6ulsbc          core-image-base,dey-image-qt,dey-image-crank,dey-image-lvgl
+	ccimx6ulsbc          core-image-base,dey-image-qt,dey-image-lvgl
 	ccimx6ulstarter      core-image-base
 	ccimx6ulsom          dey-image-mft-module-min
 	ccimx6ulrftest       dey-image-mft-module-rf
-	ccmp15-dvk           dey-image-qt,dey-image-crank,dey-image-webkit,dey-image-lvgl
+	ccmp15-dvk           dey-image-qt,dey-image-webkit,dey-image-lvgl
 	ccmp13-dvk           core-image-base
 	ccmp25-dvk           dey-image-qt,dey-image-webkit,dey-image-lvgl
 	ccimx91-dvk          core-image-base
diff --git a/sdk/mkproject.sh b/sdk/mkproject.sh
index 8d56df5a9..8f684339c 100755
--- a/sdk/mkproject.sh
+++ b/sdk/mkproject.sh
@@ -28,7 +28,7 @@ MKP_NONE="\033[0m"
 MKP_CONFIGPATH="${MKP_SCRIPTPATH}/sources/meta-digi/meta-digi-arm/conf/templates"
 
 # Blacklist platforms (not officially supported in a DEY release)
-MKP_BLACKLIST_PLATFORMS=""
+MKP_BLACKLIST_PLATFORMS="ccimx6qpsbc ccimx6sbc ccimx8mm-dvk ccimx8mn-dvk ccimx8x-sbc-express ccmp13-dvk ccmp15-dvk"
 
 MKP_SETUP_ENVIRONMENT='#!/bin/bash