diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index 69cc839..707f382 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,11 +1,7 @@
 DEPENDS:append:ibm-ac-server = " acx22-yaml-config"
 DEPENDS:append:p10bmc = " p10bmc-yaml-config"
 
-EXTRA_OECONF:ibm-ac-server = " \
-    YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
-    PROP_YAML=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml \
-    "
+IPMI_FRU_YAML:ibm-ac-server="${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml"
+IPMI_FRU_PROP_YAML:ibm-ac-server="${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml"
 
-EXTRA_OECONF:p10bmc = " \
-    YAML_GEN=${STAGING_DIR_HOST}${datadir}/p10bmc-yaml-config/ipmi-fru-read.yaml \
-    "
+IPMI_FRU_YAML:p10bmc = "${STAGING_DIR_HOST}${datadir}/p10bmc-yaml-config/ipmi-fru-read.yaml"