diff --git a/units/blockdev@.target b/units/blockdev@.target
index 1c865063513..f4034d30a50 100644
--- a/units/blockdev@.target
+++ b/units/blockdev@.target
@@ -10,5 +10,9 @@
 [Unit]
 Description=Block Device Preparation for %f
 Documentation=man:systemd.special(7)
+
 DefaultDependencies=no
+Conflicts=umount.target
+Before=umount.target
+
 StopWhenUnneeded=yes