diff --git a/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass b/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass
index 479619c..0590a83 100644
--- a/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass
+++ b/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass
@@ -2,9 +2,11 @@
 
 PACKAGECONFIG:append = " mmc_layout"
 
-EXTRA_OEMESON += "-Dactive-bmc-max-allowed=2"
-EXTRA_OEMESON += "-Dmedia-dir='/media'"
-EXTRA_OEMESON += "-Doptional-images='image-hostfw'"
+EXTRA_OEMESON:append = " \
+    -Dactive-bmc-max-allowed=2 \
+    -Dmedia-dir='/media' \
+    -Doptional-images='image-hostfw' \
+"
 
 RDEPENDS:phosphor-software-manager-updater-mmc += " \
     gptfdisk \
diff --git a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass
index 71f8c6f..9d38ada 100644
--- a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass
+++ b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass
@@ -7,8 +7,10 @@
 "
 
 # Add ubi-fs configs
-EXTRA_OEMESON += "-Dactive-bmc-max-allowed=2"
-EXTRA_OEMESON += "-Dmedia-dir='/media'"
+EXTRA_OEMESON:append = " \
+    -Dactive-bmc-max-allowed=2 \
+    -Dmedia-dir='/media' \
+"
 
 SYSTEMD_SERVICE:phosphor-software-manager-updater-ubi += " \
     obmc-flash-bmc-ubirw.service \