diff --git a/meta-digi-arm/conf/machine/include/ccmp2.inc b/meta-digi-arm/conf/machine/include/ccmp2.inc
index 900fb862b..b55167b91 100644
--- a/meta-digi-arm/conf/machine/include/ccmp2.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp2.inc
@@ -92,3 +92,6 @@ WKS_FILE_DEPENDS ?= " \
 
 # Disable the generation of flashlayout files
 ENABLE_FLASHLAYOUT_CONFIG = "0"
+
+# Remove custom kernel headers from toolchain
+ST_TOOLS_FOR_TARGET_SDK:remove = " kernel-headers "