diff --git a/meta-digi-dey/recipes-support/swupdate/swupdate/defconfig b/meta-digi-dey/recipes-support/swupdate/swupdate/defconfig
index 5696220c0..aa2ed032f 100644
--- a/meta-digi-dey/recipes-support/swupdate/swupdate/defconfig
+++ b/meta-digi-dey/recipes-support/swupdate/swupdate/defconfig
@@ -1,126 +1,8 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# SWUpdate Configuration
-#
-
-#
-# SWUpdate Settings
-#
-
-#
-# General Configuration
-#
-# CONFIG_CURL is not set
-# CONFIG_CURL_SSL is not set
-# CONFIG_DISKFORMAT is not set
-# CONFIG_SYSTEMD is not set
-CONFIG_DEFAULT_CONFIG_FILE="/etc/swupdate.cfg"
-CONFIG_SCRIPTS=y
-# CONFIG_HW_COMPATIBILITY is not set
-CONFIG_SW_VERSIONS_FILE="/etc/sw-versions"
-
-#
-# Socket Paths
-#
-CONFIG_SOCKET_CTRL_PATH=""
-CONFIG_SOCKET_PROGRESS_PATH=""
+# CONFIG_MTD is not set
 # CONFIG_LUA is not set
-# CONFIG_FEATURE_SYSLOG is not set
-
-#
-# Build Options
-#
-CONFIG_CROSS_COMPILE=""
-CONFIG_SYSROOT=""
-CONFIG_EXTRA_CFLAGS=""
-CONFIG_EXTRA_LDFLAGS=""
-CONFIG_EXTRA_LDLIBS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_WERROR is not set
-# CONFIG_NOCLEANUP is not set
-
-#
-# Bootloader support
-#
-
-#
-# Bootloader Interfaces
-#
 # CONFIG_BOOTLOADER_NONE is not set
-# CONFIG_BOOTLOADER_EBG is not set
 CONFIG_UBOOT=y
-CONFIG_UBOOT_FWENV="/etc/fw_env.config"
-CONFIG_UBOOT_DEFAULTENV="/etc/u-boot-initial-env"
-# CONFIG_BOOTLOADER_GRUB is not set
-CONFIG_BOOTLOADER_DEFAULT_UBOOT=y
-CONFIG_UPDATE_STATE_CHOICE_NONE=y
-# CONFIG_UPDATE_STATE_CHOICE_BOOTLOADER is not set
-
-#
-# Interfaces
-#
-# CONFIG_DOWNLOAD is not set
-# CONFIG_SURICATTA is not set
-# CONFIG_WEBSERVER is not set
-
-#
-# Security
-#
-# CONFIG_SSL_IMPL_NONE is not set
-CONFIG_SSL_IMPL_OPENSSL=y
-# CONFIG_SSL_IMPL_WOLFSSL is not set
-# CONFIG_SSL_IMPL_MBEDTLS is not set
 CONFIG_HASH_VERIFY=y
-# CONFIG_SIGNED_IMAGES is not set
-# CONFIG_ENCRYPTED_IMAGES is not set
-
-#
-# Compressors (zlib always on)
-#
-CONFIG_GUNZIP=y
-# CONFIG_ZSTD is not set
-
-#
-# Parsers
-#
-
-#
-# Parser Features
-#
-CONFIG_LIBCONFIG=y
-CONFIG_PARSERROOT=""
-# CONFIG_JSON is not set
-# CONFIG_SETSWDESCRIPTION is not set
-
-#
-# Handlers
-#
-
-#
-# Image Handlers
-#
-# CONFIG_ARCHIVE is not set
-# CONFIG_BOOTLOADERHANDLER is not set
-CONFIG_CFI=y
-# CONFIG_CFIHAMMING1 is not set
-# CONFIG_DELTA is not set
-# CONFIG_DISKPART is not set
-# CONFIG_DISKFORMAT_HANDLER is not set
+CONFIG_BOOTLOADERHANDLER=y
 CONFIG_RAW=y
-# CONFIG_RDIFFHANDLER is not set
-# CONFIG_READBACKHANDLER is not set
-# CONFIG_REMOTE_HANDLER is not set
 CONFIG_SHELLSCRIPTHANDLER=y
-# CONFIG_SWUFORWARDER_HANDLER is not set
-# CONFIG_SSBLSWITCH is not set
-CONFIG_UBIVOL=y
-CONFIG_UBIATTACH=y
-CONFIG_UBIBLACKLIST=""
-CONFIG_UBIWHITELIST=""
-CONFIG_UBIVIDOFFSET=0
-# CONFIG_UCFWHANDLER is not set
-# CONFIG_UNIQUEUUID is not set
diff --git a/meta-digi-dey/recipes-support/swupdate/swupdate/mtd.cfg b/meta-digi-dey/recipes-support/swupdate/swupdate/mtd.cfg
index 3e58d300c..9808999d4 100644
--- a/meta-digi-dey/recipes-support/swupdate/swupdate/mtd.cfg
+++ b/meta-digi-dey/recipes-support/swupdate/swupdate/mtd.cfg
@@ -1,2 +1,8 @@
 # Add MTD support
 CONFIG_MTD=y
+# Add UBI support
+CONFIG_UBIVOL=y
+CONFIG_UBIATTACH=y
+CONFIG_UBIBLACKLIST=""
+CONFIG_UBIWHITELIST=""
+CONFIG_UBIVIDOFFSET=0
diff --git a/meta-digi-dey/recipes-support/swupdate/swupdate/signed_images.cfg b/meta-digi-dey/recipes-support/swupdate/swupdate/signed_images.cfg
new file mode 100644
index 000000000..a6f0b2c59
--- /dev/null
+++ b/meta-digi-dey/recipes-support/swupdate/swupdate/signed_images.cfg
@@ -0,0 +1,2 @@
+# Add SIGNED_IMAGES support
+CONFIG_SIGNED_IMAGES=y
diff --git a/meta-digi-dey/recipes-support/swupdate/swupdate_%.bbappend b/meta-digi-dey/recipes-support/swupdate/swupdate_%.bbappend
index feaaeeb6e..77f54716a 100644
--- a/meta-digi-dey/recipes-support/swupdate/swupdate_%.bbappend
+++ b/meta-digi-dey/recipes-support/swupdate/swupdate_%.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2022 Digi International Inc.
+# Copyright (C) 2016-2023 Digi International Inc.
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
@@ -10,19 +10,9 @@ SRC_URI += " \
     file://0002-config-add-on-the-fly-build-configuration-variable.patch \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://systemd.cfg', '', d)} \
     ${@bb.utils.contains('STORAGE_MEDIA', 'mtd', 'file://mtd.cfg', '', d)} \
+    ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'file://signed_images.cfg', '', d)} \
 "
 
-do_configure:append() {
-	# If Trustfence is enabled, enable the signing support in the
-	# '.config' file.
-	if [ "${TRUSTFENCE_SIGN}" = "1" ]; then
-		echo "CONFIG_SIGNED_IMAGES=y" >> ${B}/.config
-	fi
-	# add U-Booot handler to use uboot: type
-	echo "CONFIG_BOOTLOADERHANDLER=y" >> ${B}/.config
-	cml1_do_configure
-}
-
 do_install:append() {
 	# Copy the 'progress' binary.
 	install -d ${D}${bindir}/