diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf
index b1191377..401c7466 100644
--- a/meta-arm-bsp/conf/machine/corstone500.conf
+++ b/meta-arm-bsp/conf/machine/corstone500.conf
@@ -4,7 +4,6 @@
 
 require conf/machine/include/tune-cortexa5.inc
 
-#
 # Corstone-500 is built against poky-tiny distro.
 # poky-tiny sets PREFERRED_PROVIDER_virtual/kernel to linux-yocto-tiny.
 # Since distro config is evaluated after the machine config, we need to
@@ -12,10 +11,8 @@ require conf/machine/include/tune-cortexa5.inc
 # PREFERRED_PROVIDER_virtual/kernel specified in the machine config will
 # apply.
 #
-PREFERRED_PROVIDER_virtual/kernel_forcevariable = "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel:forcevariable = "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.3%"
-KBUILD_DEFCONFIG = "multi_v7_defconfig"
-KCONFIG_MODE = "--alldefconfig"
 
 PREFERRED_VERSION_trusted-firmware-a ?= "2.5%"
 
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
index e66fd5fb..11366279 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
@@ -24,6 +24,9 @@ SRCREV:arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5"
 # Corstone-500 KMACHINE
 #
 COMPATIBLE_MACHINE:corstone500 = "corstone500"
+KMACHINE:corstone500 = "corstone500"
+KBUILD_DEFCONFIG:corstone500  = "multi_v7_defconfig"
+KCONFIG_MODE:corstone500 = "--alldefconfig"
 
 #
 # FVP BASE KMACHINE