diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf
index 401c7466..e87d81d8 100644
--- a/meta-arm-bsp/conf/machine/corstone500.conf
+++ b/meta-arm-bsp/conf/machine/corstone500.conf
@@ -2,7 +2,7 @@
 #@NAME: Corstone-500 machine
 #@DESCRIPTION: Machine configuration for the Corstone-500 platform
 
-require conf/machine/include/tune-cortexa5.inc
+require conf/machine/include/arm/armv7a/tune-cortexa5.inc
 
 # Corstone-500 is built against poky-tiny distro.
 # poky-tiny sets PREFERRED_PROVIDER_virtual/kernel to linux-yocto-tiny.
diff --git a/meta-arm-bsp/conf/machine/include/corstone700.inc b/meta-arm-bsp/conf/machine/include/corstone700.inc
index 229a2262..0ec385ab 100644
--- a/meta-arm-bsp/conf/machine/include/corstone700.inc
+++ b/meta-arm-bsp/conf/machine/include/corstone700.inc
@@ -1,6 +1,6 @@
 # Common configuration for all Corstone700 machines
 
-require conf/machine/include/tune-cortexa32.inc
+require conf/machine/include/arm/armv8a/tune-cortexa32.inc
 
 MACHINEOVERRIDES =. "corstone700:"
 
diff --git a/meta-arm/conf/machine/microbit-v1.conf b/meta-arm/conf/machine/microbit-v1.conf
index 84663d47..1fa2532f 100644
--- a/meta-arm/conf/machine/microbit-v1.conf
+++ b/meta-arm/conf/machine/microbit-v1.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine for BBC Microbit v1, Zephyr BOARD qemu_cortex_m0
 
 require conf/machine/include/qemu.inc
-require conf/machine/include/tune-cortex-m0.inc
+require conf/machine/include/arm/armv6m/tune-cortexm0.inc
 
 MACHINEOVERRIDES =. "nordic:"
 
diff --git a/meta-arm/conf/machine/qemu-cortex-a53.conf b/meta-arm/conf/machine/qemu-cortex-a53.conf
index 294c65f5..b97cde7e 100644
--- a/meta-arm/conf/machine/qemu-cortex-a53.conf
+++ b/meta-arm/conf/machine/qemu-cortex-a53.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine for Zephyr BOARD qemu_cortex_a53
 
 require conf/machine/include/qemu.inc
-require conf/machine/include/tune-cortexa53.inc
+require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 
 TCLIBC = "newlib"