diff --git a/classes/phosphor-software-manager-ubi-fs.bbclass b/classes/phosphor-software-manager-ubi-fs.bbclass
index 0280133..17b50da 100644
--- a/classes/phosphor-software-manager-ubi-fs.bbclass
+++ b/classes/phosphor-software-manager-ubi-fs.bbclass
@@ -6,10 +6,6 @@
     mtd-utils-ubifs \
 "
 
-FILES_${PN}-updater-ubi += " \
-    /usr/local \
-    "
-
 # Remove default configs
 EXTRA_OECONF_remove_df-obmc-ubi-fs += " \
     ACTIVE_BMC_MAX_ALLOWED=1 \
@@ -34,7 +30,6 @@
     reboot-guard-enable.service \
     reboot-guard-disable.service \
     force-reboot.service \
-    usr-local.mount \
 "
 
 # Name of the mtd device where the ubi volumes should be created
@@ -50,6 +45,3 @@
 SYSTEMD_SUBSTITUTIONS += "KERNEL_MTD:${BMC_KERNEL_MTD}:obmc-flash-bmc-ubiro@.service"
 SYSTEMD_SUBSTITUTIONS += "RW_SIZE:${BMC_RW_SIZE}:obmc-flash-bmc-ubirw.service"
 
-do_install_append() {
-    install -d ${D}/usr/local
-}
diff --git a/recipes-phosphor/flash/phosphor-software-manager.inc b/recipes-phosphor/flash/phosphor-software-manager.inc
index 7e0c68f..e72b2ef 100644
--- a/recipes-phosphor/flash/phosphor-software-manager.inc
+++ b/recipes-phosphor/flash/phosphor-software-manager.inc
@@ -2,4 +2,4 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt"
-SRCREV = "f6144e9e2aba399246f1dba8544844f518968c07"
+SRCREV = "22848eceb4f19c93b1e3331e52005ce09523637d"
diff --git a/recipes-phosphor/flash/phosphor-software-manager_git.bb b/recipes-phosphor/flash/phosphor-software-manager_git.bb
index 588c55f..bdd95df 100644
--- a/recipes-phosphor/flash/phosphor-software-manager_git.bb
+++ b/recipes-phosphor/flash/phosphor-software-manager_git.bb
@@ -58,6 +58,7 @@
 FILES_${PN}-updater += " \
     ${bindir}/phosphor-image-updater \
     ${bindir}/obmc-flash-bmc \
+    /usr/local \
     "
 FILES_${PN}-sync += " \
     ${bindir}/phosphor-sync-software-manager \
@@ -70,6 +71,11 @@
 
 SYSTEMD_SERVICE_${PN}-updater += " \
     obmc-flash-bmc-setenv@.service \
+    usr-local.mount \
 "
 
 S = "${WORKDIR}/git"
+
+do_install_append() {
+    install -d ${D}/usr/local
+}