diff --git a/meta-digi-arm/conf/machine/include/ccmp2.inc b/meta-digi-arm/conf/machine/include/ccmp2.inc
index 3d5d89708..897799d17 100644
--- a/meta-digi-arm/conf/machine/include/ccmp2.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp2.inc
@@ -131,5 +131,12 @@ ENABLE_FLASHLAYOUT_CONFIG = "0"
 # Remove custom kernel headers from toolchain
 ST_TOOLS_FOR_TARGET_SDK:remove = " kernel-headers "
 
+# Remove toolchain for TF-A on aarch64 added by st-machine-common-stm32mp.inc
+# because it throws a build issue.
+ST_TOOLS_FOR_SDK:remove:aarch64 = " \
+    nativesdk-gcc-aarch64-none-elf \
+    nativesdk-gcc-aarch64-none-elf-staticdev \
+"
+
 # Disable partitions configuration from ST layer
 ENABLE_PARTITIONS_IMAGE ??= "0"