diff --git a/classes/phosphor-software-manager-ubi-fs.bbclass b/classes/phosphor-software-manager-ubi-fs.bbclass
index 466d3ce..42e08ce 100644
--- a/classes/phosphor-software-manager-ubi-fs.bbclass
+++ b/classes/phosphor-software-manager-ubi-fs.bbclass
@@ -10,6 +10,16 @@
     /usr/local \
     "
 
+# Remove default configs
+EXTRA_OECONF_remove_df-obmc-ubi-fs += " \
+    MEDIA_DIR=/run/media \
+"
+
+# Add ubi-fs configs
+EXTRA_OECONF_append_df-obmc-ubi-fs += " \
+    MEDIA_DIR=/media \
+"
+
 SYSTEMD_SERVICE_phosphor-software-manager-updater-ubi += " \
     obmc-flash-bmc-ubirw.service \
     obmc-flash-bmc-ubiro@.service \
diff --git a/common/recipes-phosphor/flash/phosphor-software-manager.bb b/common/recipes-phosphor/flash/phosphor-software-manager.bb
index f949801..eb2468d 100644
--- a/common/recipes-phosphor/flash/phosphor-software-manager.bb
+++ b/common/recipes-phosphor/flash/phosphor-software-manager.bb
@@ -56,6 +56,9 @@
     sdbusplus \
     virtual-obmc-image-manager \
 "
+EXTRA_OECONF += " \
+    MEDIA_DIR=/run/media \
+"
 
 RPROVIDES_${PN}-version += " \
     virtual-obmc-image-manager \