diff --git a/meta-asrock/conf/layer.conf b/meta-asrock/conf/layer.conf
index 4c06d87..3798223 100644
--- a/meta-asrock/conf/layer.conf
+++ b/meta-asrock/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "asrock-layer"
 BBFILE_PATTERN_asrock-layer = "^${LAYERDIR}/"
 LAYERVERSION_asrock-layer = "1"
-LAYERSERIES_COMPAT_asrock-layer = "hardknott"
+LAYERSERIES_COMPAT_asrock-layer = "hardknott honister"
diff --git a/meta-asrock/meta-e3c246d4i/conf/layer.conf b/meta-asrock/meta-e3c246d4i/conf/layer.conf
index 6b8e771..8185611 100644
--- a/meta-asrock/meta-e3c246d4i/conf/layer.conf
+++ b/meta-asrock/meta-e3c246d4i/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "e3c246d4i-layer"
 BBFILE_PATTERN_e3c246d4i-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_e3c246d4i-layer = "hardknott"
+LAYERSERIES_COMPAT_e3c246d4i-layer = "hardknott honister"
diff --git a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample b/meta-asrock/meta-e3c246d4i/conf/local.conf.sample
index 1c86431..fa8e7f0 100644
--- a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample
+++ b/meta-asrock/meta-e3c246d4i/conf/local.conf.sample
@@ -1,7 +1,7 @@
 MACHINE ??= "e3c246d4i"
 DISTRO ?= "openbmc-phosphor"
 PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
+SANITY_TESTED_DISTROS:append ?= " *"
 EXTRA_IMAGE_FEATURES = "debug-tweaks"
 USER_CLASSES ?= "buildstats image-prelink"
 PATCHRESOLVE = "noop"
@@ -14,7 +14,7 @@
     ABORT,${DL_DIR},100M,1K \
     ABORT,${SSTATE_DIR},100M,1K \
     ABORT,/tmp,10M,1K"
-CONF_VERSION = "1"
+CONF_VERSION = "2"
 INHERIT += "extrausers"
 EXTRA_USERS_PARAMS = " \
   usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
diff --git a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb
index 22619cf..e9f676d 100644
--- a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb
+++ b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb
@@ -12,17 +12,17 @@
 PROVIDES += "virtual/obmc-flash-mgmt"
 PROVIDES += "virtual/obmc-system-mgmt"
 
-RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt"
-RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt"
+RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt"
+RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt"
 
-SUMMARY_${PN}-flash = "ASRock Flash"
-RDEPENDS_${PN}-flash = " \
+SUMMARY:${PN}-flash = "ASRock Flash"
+RDEPENDS:${PN}-flash = " \
 	obmc-control-bmc \
 	phosphor-ipmi-flash \
 	"
 
-SUMMARY_${PN}-system = "ASRock System"
-RDEPENDS_${PN}-system = " \
+SUMMARY:${PN}-system = "ASRock System"
+RDEPENDS:${PN}-system = " \
 	bmcweb \
 	entity-manager \
 	dbus-sensors \