diff --git a/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
index 8d49f50..4c32ab4 100644
--- a/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
+++ b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
@@ -172,15 +172,9 @@
 }
 
 remount_ubi() {
-  # Get a list of all devices formatted as UBI
-  for file in /dev/mtd*; do
-    if [[ $(hexdump -C -n 3 $file) =~ "UBI" ]]; then
-      mtd="${file: -1}"
-      if [[ $mtd =~ ^-?[0-9]+$ ]]; then
-        mtds=${mtd},${mtds}
-      fi
-    fi
-  done
+  bmcmtd="$(findmtd "bmc")"
+  altbmcmtd="$(findmtd "alt-bmc")"
+  mtds="${bmcmtd: -1}","${altbmcmtd: -1}"
 
   IFS=',' read -r -a mtds <<< "$mtds"
   mtds=($(echo "${mtds[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' '))