diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp2.inc b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp2.inc
index 9081c90d3..9ad148a23 100644
--- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp2.inc
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp2.inc
@@ -596,7 +596,7 @@ do_deploy() {
     if [ "${TF_A_ENABLE_METADATA}" = "1" ]; then
         install -d "${DEPLOYDIR}/arm-trusted-firmware"
         if [ -f "${B}/${TF_A_METADATA_NAME}.${TF_A_METADATA_SUFFIX}" ]; then
-            install -m 644 "${B}/${TF_A_METADATA_NAME}.${TF_A_METADATA_SUFFIX}" "${DEPLOYDIR}/arm-trusted-firmware/${TF_A_METADATA_BIN}"
+            install -m 644 "${B}/${TF_A_METADATA_NAME}.${TF_A_METADATA_SUFFIX}" "${DEPLOYDIR}/arm-trusted-firmware/${TF_A_METADATA_BINARY}"
         fi
     fi
 }
diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bbappend
new file mode 100644
index 000000000..9412cbbac
--- /dev/null
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bbappend
@@ -0,0 +1,35 @@
+# Copyright (C) 2024, Digi International Inc.
+
+do_deploy:append() {
+    unset i
+    for config in ${TF_A_CONFIG}; do
+        i=$(expr $i + 1)
+        dt_config=$(echo ${TF_A_DEVICETREE} | cut -d',' -f${i})
+        tfa_basename=$(echo ${TF_A_BINARIES} | cut -d',' -f${i})
+        for dt in ${dt_config}; do
+            TF_A_FILENAME="${tfa_basename}-${dt}-${config}.${TF_A_SUFFIX}"
+            if [ -f "${DEPLOYDIR}/arm-trusted-firmware/${TF_A_FILENAME}" ]; then
+                ln -s "arm-trusted-firmware/${TF_A_FILENAME}" "${DEPLOYDIR}"
+            fi
+        done
+    done
+
+    # Last value of 'dt' is good for metadata binary, so use that.
+    if [ "${TF_A_ENABLE_METADATA}" = "1" ]; then
+            if [ -f "${DEPLOYDIR}/arm-trusted-firmware/${TF_A_METADATA_BINARY}" ]; then
+                ln -s "arm-trusted-firmware/${TF_A_METADATA_BINARY}" "${DEPLOYDIR}/${TF_A_METADATA_NAME}-${dt}.${TF_A_METADATA_SUFFIX}"
+            fi
+    fi
+
+    unset i
+    for config in ${FIP_CONFIG}; do
+        i=$(expr $i + 1)
+        dt_config="$(echo ${FIP_DEVICETREE} | cut -d',' -f${i})"
+        for dt in ${dt_config}; do
+            FIP_FILENAME="${FIP_BASENAME}-${dt}-${config}${FIP_SIGN_SUFFIX}.${FIP_SUFFIX}"
+            if [ -f "${DEPLOYDIR}/fip/${FIP_FILENAME}" ]; then
+                ln -s "fip/${FIP_FILENAME}" "${DEPLOYDIR}"
+            fi
+        done
+    done
+}