diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init.bb b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init.bb
index 789431b..3d193bc 100644
--- a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init.bb
+++ b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init.bb
@@ -19,6 +19,8 @@
 
 S = "${WORKDIR}"
 
+NOROOTFS_PERSISTENT_DIRS = "var etc ${@ d.getVar('ROOT_HOME')[1:]}"
+
 inherit allarch
 inherit update-alternatives
 
@@ -31,6 +33,14 @@
     for f in ${SOURCE_FILES} ; do
         install -m 0755 ${S}/$f ${D}${PKG_INSTALL_DIR}/$f
     done
+
+    # Create persistent mount points and add to mount script.
+    for mountpoint in ${NOROOTFS_PERSISTENT_DIRS} ; do
+        mkdir -p ${D}/$mountpoint
+        touch ${D}/$mountpoint/.keep.mount-persistent
+    done
+    sed -i "s#@NOROOTFS_PERSISTENT_DIRS@#${NOROOTFS_PERSISTENT_DIRS}#" \
+        ${D}${PKG_INSTALL_DIR}/50-mount-persistent
 }
 
 RDEPENDS:${PN} += " \
@@ -41,6 +51,8 @@
     udev \
 "
 
+FILES:${PN}:append = " ${@ " ".join([ '/' + x + '/.keep.mount-persistent' for x in d.getVar('NOROOTFS_PERSISTENT_DIRS').split() ])}"
+
 ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init"
 # Use a number higher than the systemd init alternative so that
 # ours is enabled instead.
diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/50-mount-persistent b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/50-mount-persistent
index 6b6d9a4..9ec0e2f 100644
--- a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/50-mount-persistent
+++ b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/50-mount-persistent
@@ -6,7 +6,8 @@
     exit 0
 fi
 
-for m in var etc home/root; do
+# shellcheck disable=SC2043 # @@ pattern will be replaced by recipe
+for m in @NOROOTFS_PERSISTENT_DIRS@; do
     if [ ! -d $PERSIST/$m-data ]; then
         mkdir -p $PERSIST/$m-data
     fi