diff --git a/userspace/files/fstab b/userspace/files/fstab
index 55d3d81..bcc71da 100644
--- a/userspace/files/fstab
+++ b/userspace/files/fstab
@@ -2,6 +2,5 @@
 /dev/disk/by-partlabel/modem_a /firmware auto ro
 /dev/disk/by-partlabel/persist /persist auto ro,discard,nosuid,nodev,noexec
 /dev/disk/by-partlabel/userdata /data auto discard,noatime,nodiratime,nosuid,nodev,nofail 0 0
-/dev/nvme0n1 /data/media auto discard,nosuid,nodev,nofail,x-systemd.device-timeout=5s 0 0
 tmpfs /var tmpfs rw,nosuid,nodev,size=128M,mode=755 0 0
 tmpfs /tmp tmpfs rw,nosuid,nodev,size=150M,mode=1777 0 0
diff --git a/userspace/files/mount_storage.service b/userspace/files/mount_storage.service
new file mode 100644
index 0000000..00ff393
--- /dev/null
+++ b/userspace/files/mount_storage.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Mount storage drive
+After=data.mount
+
+[Service]
+Type=oneshot
+ExecStart=/usr/comma/mount-storage.sh
+
+[Install]
+WantedBy=local-fs.target
diff --git a/userspace/services.sh b/userspace/services.sh
index 9778c58..99fa0cc 100755
--- a/userspace/services.sh
+++ b/userspace/services.sh
@@ -17,6 +17,7 @@ systemctl enable weston.service
 systemctl enable wifi.service
 systemctl enable init-qcom.service
 systemctl enable power_drop_monitor.service
+systemctl enable mount_storage.service
 systemctl enable brightnessd.service
 systemctl enable ssh-param-watcher.path
 systemctl enable ssh-param-watcher.service
diff --git a/userspace/usr/comma/mount-storage.sh b/userspace/usr/comma/mount-storage.sh
new file mode 100755
index 0000000..236a301
--- /dev/null
+++ b/userspace/usr/comma/mount-storage.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+SD="/dev/mmcblk0"
+NVME="/dev/nvme0n1"
+MOUNT_OPTS="nosuid,nodev,noatime,nodiratime"
+MOUNTPOINT="/data/media"
+
+if mount $NVME $MOUNTPOINT -o discard,$MOUNT_OPTS; then
+  echo "Mounted NVMe"
+  exit 0
+else
+  echo "Failed to mount NVMe"
+fi
+
+if mount $SD $MOUNTPOINT -o $MOUNT_OPTS; then
+  echo "Mounted SD card"
+else
+  echo "Failed to mount SD card"
+fi