diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
index f3226cdf606..e1626b9c872 100644
--- a/units/systemd-nspawn@.service.in
+++ b/units/systemd-nspawn@.service.in
@@ -10,7 +10,7 @@
 [Unit]
 Description=Container %i
 Documentation=man:systemd-nspawn(1)
-Wants=modprobe@tun.service modprobe@loop.service modprobe@dm-mod.service
+Wants=modprobe@tun.service modprobe@loop.service modprobe@dm_mod.service
 PartOf=machines.target
 Before=machines.target
 After=network.target modprobe@tun.service modprobe@loop.service modprobe@dm_mod.service
diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in
index 92e0a9b3cd1..105be680cd6 100644
--- a/units/systemd-repart.service.in
+++ b/units/systemd-repart.service.in
@@ -12,7 +12,8 @@ Description=Repartition Root Disk
 Documentation=man:systemd-repart.service(8)
 DefaultDependencies=no
 Conflicts=shutdown.target
-After=initrd-usr-fs.target
+Wants=modprobe@loop.service modprobe@dm_mod.service
+After=initrd-usr-fs.target modprobe@loop.service modprobe@dm_mod.service
 Before=initrd-root-fs.target shutdown.target
 ConditionVirtualization=!container
 ConditionDirectoryNotEmpty=|/usr/lib/repart.d