diff --git a/conf/machine/include/nrf52.inc b/conf/machine/include/nrf52.inc
index d22f8bce41a3b2071b686090a3c6fcea424c0ad5..a407da8277558bee67c298a49c5013a0a49951be 100644
--- a/conf/machine/include/nrf52.inc
+++ b/conf/machine/include/nrf52.inc
@@ -6,6 +6,13 @@
 require conf/machine/include/tune-cortexm4.inc
 
 MACHINEOVERRIDES =. "nordic:"
+MACHINEOVERRIDES =. "zmbedtls:"
+MACHINEOVERRIDES =. "zsof:"
+MACHINEOVERRIDES =. "ztracerecorder:"
+MACHINEOVERRIDES =. "ztfm:"
+MACHINEOVERRIDES =. "znanopb:"
+MACHINEOVERRIDES =. "ztensorflow:"
+MACHINEOVERRIDES =. "zsegger:"
 
 TUNE_FEATURES = "armv7m cortexm4"
 
diff --git a/conf/machine/include/stm32mp1-cortex-m4.inc b/conf/machine/include/stm32mp1-cortex-m4.inc
index b82b02db0bb6354b56d23039c4853a644e068ff9..5030767b9a2246a7045a4b26d8f5d603a77ed723 100644
--- a/conf/machine/include/stm32mp1-cortex-m4.inc
+++ b/conf/machine/include/stm32mp1-cortex-m4.inc
@@ -6,6 +6,13 @@
 require conf/machine/include/tune-cortexm4.inc
 
 # Include OpenAMP for communication with Cortex-A7 core of the SoC
-MACHINEOVERRIDES =. "stm32:openamp:"
+MACHINEOVERRIDES =. "stm32:zopenamp:"
+MACHINEOVERRIDES =. "zmbedtls:"
+MACHINEOVERRIDES =. "zsof:"
+MACHINEOVERRIDES =. "ztracerecorder:"
+MACHINEOVERRIDES =. "ztfm:"
+MACHINEOVERRIDES =. "znanopb:"
+MACHINEOVERRIDES =. "ztensorflow:"
+MACHINEOVERRIDES =. "zsegger:"
 
 TUNE_FEATURES = "armv7m cortexm4"