diff --git a/meta-phosphor/recipes-core/base-files/base-files/fstab b/meta-phosphor/recipes-core/base-files/base-files/df-ubi/fstab
similarity index 100%
rename from meta-phosphor/recipes-core/base-files/base-files/fstab
rename to meta-phosphor/recipes-core/base-files/base-files/df-ubi/fstab
diff --git a/meta-phosphor/recipes-core/base-files/base-files_%.bbappend b/meta-phosphor/recipes-core/base-files/base-files_%.bbappend
index 4b48dc7..5da4025 100644
--- a/meta-phosphor/recipes-core/base-files/base-files_%.bbappend
+++ b/meta-phosphor/recipes-core/base-files/base-files_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_df-obmc-ubi-fs := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_df-obmc-ubi-fs := "${THISDIR}/${PN}/df-ubi:"
 
 RDEPENDS_${PN}_append_df-obmc-ubi-fs = " preinit-mounts"