diff --git a/common/recipes-core/busybox/busybox/mountpoint.cfg b/common/recipes-core/busybox/busybox/mountpoint.cfg
new file mode 100644
index 0000000..8b00951
--- /dev/null
+++ b/common/recipes-core/busybox/busybox/mountpoint.cfg
@@ -0,0 +1 @@
+CONFIG_MOUNTPOINT=y
diff --git a/common/recipes-core/busybox/busybox_%.bbappend b/common/recipes-core/busybox/busybox_%.bbappend
index 39a6033..e6678fc 100644
--- a/common/recipes-core/busybox/busybox_%.bbappend
+++ b/common/recipes-core/busybox/busybox_%.bbappend
@@ -1,4 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://busybox.cfg"
 SRC_URI += "file://flash.cfg"
+SRC_URI += "file://mountpoint.cfg"
 SRC_URI += "file://0001-Stop-watchdog-first-on-startup.patch"
diff --git a/common/recipes-phosphor/mount-overlay-help/mount-overlay-help/prepare-overlay.service b/common/recipes-phosphor/mount-overlay-help/mount-overlay-help/prepare-overlay.service
index ae5f461..66843b3 100644
--- a/common/recipes-phosphor/mount-overlay-help/mount-overlay-help/prepare-overlay.service
+++ b/common/recipes-phosphor/mount-overlay-help/mount-overlay-help/prepare-overlay.service
@@ -4,6 +4,6 @@
 DefaultDependencies=false
 
 [Service]
-ExecStart=/bin/sh -c "rm -rf /var/persist/etc-work && mkdir -p /var/persist/etc /var/persist/etc-work /var/persist/home/root"
+ExecStart=/bin/sh -c "if ! mountpoint /etc; then rm -rf /var/persist/etc-work && mkdir -p /var/persist/etc-work; fi; mkdir -p /var/persist/etc /var/persist/home/root"
 Type=oneshot
 RemainAfterExit=no