diff --git a/meta-facebook/recipes-core/base-files/base-files_%.bbappend b/meta-facebook/recipes-core/base-files/base-files_%.bbappend
index a1ff5d8..a642347 100644
--- a/meta-facebook/recipes-core/base-files/base-files_%.bbappend
+++ b/meta-facebook/recipes-core/base-files/base-files_%.bbappend
@@ -1,10 +1,8 @@
 do_install:append:mf-fb-secondary-emmc() {
         # create eMMC mount point
-        install -m 0755 -d ${D}/mnt/data
-        # Symlink to /mnt/emmc for transition.
-        ln -s /mnt/data ${D}/mnt/emmc
+        install -m 0755 -d ${D}/mnt/emmc
 
         # insert fstab entry for eMMC
-        FSTAB_EMMC="/dev/mmcblk0 /mnt/data btrfs compress=zstd,discard,nofail,x-systemd.device-timeout=10s 0 0"
+        FSTAB_EMMC="/dev/mmcblk0 /mnt/emmc btrfs compress=zstd,discard,nofail,x-systemd.device-timeout=10s 0 0"
         echo "$FSTAB_EMMC" >> ${D}${sysconfdir}/fstab
 }
diff --git a/meta-facebook/recipes-fb/emmc-init/files/emmc-init.service b/meta-facebook/recipes-fb/emmc-init/files/emmc-init.service
index f093f3d..8367949 100644
--- a/meta-facebook/recipes-fb/emmc-init/files/emmc-init.service
+++ b/meta-facebook/recipes-fb/emmc-init/files/emmc-init.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=eMMC initialize check
-Before=mnt-data.mount
+Before=mnt-emmc.mount
 Requires=dev-mmcblk0.device
 After=dev-mmcblk0.device
 
diff --git a/meta-facebook/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init.bbappend b/meta-facebook/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init.bbappend
index 06d66e8..bbee1a8 100644
--- a/meta-facebook/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init.bbappend
+++ b/meta-facebook/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init.bbappend
@@ -1,8 +1,3 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 NOROOTFS_PERSISTENT_DIRS:append = " mnt/data"
-
-# Bletchley currently uses /mnt/data as the emmc mount location.  We are in the
-# process of moving this to /mnt/emmc but need to change some code in production
-# before we can use /mnt/emmc.
-NOROOTFS_PERSISTENT_DIRS:remove:bletchley = " mnt/data"