diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/haos-data-disk-detach.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/haos-data-disk-detach.service
new file mode 100644
index 000000000..16495b302
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/haos-data-disk-detach.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=HAOS data disk detach
+DefaultDependencies=no
+Before=mnt-data.mount
+RefuseManualStart=true
+RefuseManualStop=true
+Requires=dev-disk-by\x2dlabel-hassos\x2ddata.device
+After=dev-disk-by\x2dlabel-hassos\x2ddata.device systemd-fsck@dev-disk-by\x2dlabel-hassos\x2ddata.service
+ConditionFirstBoot=yes
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/haos-data-disk-detach
+
+[Install]
+WantedBy=local-fs.target
diff --git a/buildroot-external/rootfs-overlay/usr/libexec/haos-data-disk-detach b/buildroot-external/rootfs-overlay/usr/libexec/haos-data-disk-detach
new file mode 100755
index 000000000..361a6745e
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/libexec/haos-data-disk-detach
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Find root using rdev command
+rootpart=$(rdev | cut -f 1 -d ' ')
+rootdev=$(lsblk -no pkname "${rootpart}")
+
+# Wait up to 10s for devices to enumerate
+sleep 10s
+
+datapartitions=$(blkid --match-token LABEL="hassos-data" --output device)
+
+for datapart in ${datapartitions}
+do
+	datadev=$(lsblk -no pkname "${datapart}")
+
+	# If major does not match our root device major, it is an external data
+	# disk. Rename to make sure it gets ignored.
+	if [ "$rootdev" != "$datadev" ]
+	then
+		echo "Found external data disk device on ${datapart}, mark it disabled..."
+		e2label "${datapart}" hassos-data-dis
+	fi
+done