diff --git a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass
index 6ca1fb1..71f8c6f 100644
--- a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass
+++ b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass
@@ -1,8 +1,8 @@
 # UBI-specific configuration for the phosphor-manager-software package
 
-PACKAGECONFIG_append = " ubifs_layout"
+PACKAGECONFIG:append = " ubifs_layout"
 
-RDEPENDS_phosphor-software-manager-updater-ubi += " \
+RDEPENDS:phosphor-software-manager-updater-ubi += " \
     mtd-utils-ubifs \
 "
 
@@ -10,7 +10,7 @@
 EXTRA_OEMESON += "-Dactive-bmc-max-allowed=2"
 EXTRA_OEMESON += "-Dmedia-dir='/media'"
 
-SYSTEMD_SERVICE_phosphor-software-manager-updater-ubi += " \
+SYSTEMD_SERVICE:phosphor-software-manager-updater-ubi += " \
     obmc-flash-bmc-ubirw.service \
     obmc-flash-bmc-ubiro@.service \
     obmc-flash-bmc-ubirw-remove.service \
@@ -28,7 +28,7 @@
 FLASH_SIZE ?= "32768"
 DISTROOVERRIDES .= ":flash-${FLASH_SIZE}"
 BMC_RW_SIZE ??= "0x600000"
-BMC_RW_SIZE_flash-131072 = "0x2000000"
+BMC_RW_SIZE:flash-131072 = "0x2000000"
 SYSTEMD_SUBSTITUTIONS += "RW_MTD:${BMC_RW_MTD}:obmc-flash-bmc-ubirw.service"
 SYSTEMD_SUBSTITUTIONS += "RO_MTD:${BMC_RO_MTD}:obmc-flash-bmc-ubiro@.service"
 SYSTEMD_SUBSTITUTIONS += "KERNEL_MTD:${BMC_KERNEL_MTD}:obmc-flash-bmc-ubiro@.service"