diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt
index 0dc69b973..173b3b84d 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt
@@ -84,7 +84,7 @@ if test "${module_has_npu}" = "1" && test -z "${disable_npu}"; then
 	setenv overlays _ov_som_npu_ccimx93.dtbo,${overlays}
 fi
 
-if test "${dboot_kernel_var}" = "fitimage"; then
+if test "${dboot_kernel_var}" = "fitimage" && test -z "${temp-fitimg-loaded}"; then
 	# Set temp var to avoid re-loading fitimage
 	setenv temp-fitimg-loaded yes
 fi
diff --git a/meta-digi-dey/classes/trustfence.bbclass b/meta-digi-dey/classes/trustfence.bbclass
index 7b59b474f..d8db03b7d 100644
--- a/meta-digi-dey/classes/trustfence.bbclass
+++ b/meta-digi-dey/classes/trustfence.bbclass
@@ -24,7 +24,6 @@ TRUSTFENCE_CONSOLE_DISABLE ?= "0"
 TRUSTFENCE_SIGN ?= "1"
 TRUSTFENCE_SIGN_KEYS_PATH ?= "default"
 TRUSTFENCE_DEK_PATH ?= "default"
-TRUSTFENCE_DEK_PATH:ccimx93 ?= "0"
 TRUSTFENCE_DEK_PATH:ccmp1 ?= "0"
 TRUSTFENCE_ENCRYPT_ENVIRONMENT ?= "1"
 TRUSTFENCE_ENCRYPT_ENVIRONMENT:ccimx93 ?= "0"