diff --git a/board/common/overlay/etc/fstab.disk b/board/common/overlay/etc/fstab.disk
new file mode 100644
index 0000000000..c69e0d4af5
--- /dev/null
+++ b/board/common/overlay/etc/fstab.disk
@@ -0,0 +1,4 @@
+# <file system> <mount pt>            <type>   <options>         <dump> <pass>
+/dev/mmcblk0p1  /boot                 vfat     ro,defaults       0      0
+/dev/mmcblk0p3  /data                 ext4     defaults,noatime  0      0
+
diff --git a/board/common/overlay/etc/fstab.extra b/board/common/overlay/etc/fstab.extra
new file mode 100644
index 0000000000..48c817d604
--- /dev/null
+++ b/board/common/overlay/etc/fstab.extra
@@ -0,0 +1,2 @@
+# <file system> <mount pt>            <type>   <options>         <dump> <pass>
+
diff --git a/board/common/overlay/etc/fstab b/board/common/overlay/etc/fstab.sys
similarity index 75%
rename from board/common/overlay/etc/fstab
rename to board/common/overlay/etc/fstab.sys
index 0d7dc25122..e5bb8d8767 100644
--- a/board/common/overlay/etc/fstab
+++ b/board/common/overlay/etc/fstab.sys
@@ -4,6 +4,4 @@ devpts          /dev/pts              devpts   gid=5,mode=620    0      0
 tmpfs           /dev/shm              tmpfs    mode=0777         0      0
 tmpfs           /tmp                  tmpfs    mode=1777         0      0
 sysfs           /sys                  sysfs    defaults          0      0
-/dev/mmcblk0p1  /boot                 vfat     ro,defaults       0      0
-/dev/mmcblk0p3  /data                 ext4     defaults,noatime  0      0
 
diff --git a/board/common/overlay/etc/init.d/S00datapart b/board/common/overlay/etc/init.d/S00datapart
index 6ac2203e13..d69d2d37a3 100755
--- a/board/common/overlay/etc/init.d/S00datapart
+++ b/board/common/overlay/etc/init.d/S00datapart
@@ -24,7 +24,7 @@ case "$1" in
         test $? == 0 && msg_done || msg_fail
 
         msg_begin "Mounting data partition"
-        mount /data
+        mount -T /etc/fstab.disk /data
         test $? == 0 && msg_done || msg_fail
 
         msg_begin "Creating required data files"
@@ -39,7 +39,8 @@ case "$1" in
         msg_done
 
         # mount other partitions depending on data
-        mount -a
+        mount -T /etc/fstab.disk -a
+        mount -T /etc/fstab.extra -a
         ;;
 
     stop)
diff --git a/board/common/overlay/etc/init.d/S01mountall b/board/common/overlay/etc/init.d/S01mountall
index 71ce7bb018..3d61d07e80 100755
--- a/board/common/overlay/etc/init.d/S01mountall
+++ b/board/common/overlay/etc/init.d/S01mountall
@@ -4,7 +4,8 @@ test -n "$os_version" || source /etc/init.d/base
 
 mount_fs() {
     msg_begin "Mounting filesystems"
-    /bin/mount -a
+    /bin/mount -T /etc/fstab.disk -a
+    /bin/mount -T /etc/fstab.extra -a
     test $? == 0 && msg_done || msg_fail
 }
 
diff --git a/board/common/overlay/etc/init.d/mountsys b/board/common/overlay/etc/init.d/mountsys
index 744b29a360..1963d2f2a3 100755
--- a/board/common/overlay/etc/init.d/mountsys
+++ b/board/common/overlay/etc/init.d/mountsys
@@ -3,8 +3,8 @@
 /bin/mkdir -p /dev/pts
 /bin/mkdir -p /dev/shm
 /bin/mount --make-shared /
-/bin/mount -a -t proc
-/bin/mount -a -t devpts
-/bin/mount -a -t tmpfs
-/bin/mount -a -t sysfs
+/bin/mount -T /etc/fstab.sys -a -t proc
+/bin/mount -T /etc/fstab.sys -a -t devpts
+/bin/mount -T /etc/fstab.sys -a -t tmpfs
+/bin/mount -T /etc/fstab.sys -a -t sysfs