diff --git a/conf/layer.conf b/conf/layer.conf
index aae62c4..a6035fc 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,8 +9,8 @@ BBFILE_COLLECTIONS += "stm-st-stm32mp"
 BBFILE_PATTERN_stm-st-stm32mp := "^${LAYERDIR}/"
 BBFILE_PRIORITY_stm-st-stm32mp = "6"
 
-EULA_FILE_ST_stm32mpcommon = "${LAYERDIR}/conf/eula/${MACHINE}"
-EULA_FILE_ST_MD5SUM_stm32mpcommon = "8b505090fb679839cefbcc784afe8ce9"
+EULA_FILE_ST:stm32mpcommon = "${LAYERDIR}/conf/eula/${MACHINE}"
+EULA_FILE_ST_MD5SUM:stm32mpcommon = "8b505090fb679839cefbcc784afe8ce9"
 
 # Set a variable to get the STM32MP BSP location
 STM32MP_BASE = "${LAYERDIR}"
@@ -18,7 +18,7 @@ STM32MP_BASE = "${LAYERDIR}"
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
 LAYERVERSION_stm-st-stm32mp = "1"
-LAYERSERIES_COMPAT_stm-st-stm32mp = "dunfell"
+LAYERSERIES_COMPAT_stm-st-stm32mp = "kirkstone"
 
 # for optee-os-stm32mp dependency
 LAYERDEPENDS_stm-st-stm32mp = "core openembedded-layer meta-python"