diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
index db61ef12d3..6beedf79e7 100644
--- a/presets/90-systemd.preset
+++ b/presets/90-systemd.preset
@@ -19,7 +19,6 @@ enable getty@.service
 enable systemd-timesyncd.service
 enable systemd-networkd.service
 enable systemd-resolved.service
-enable systemd-repart.service
 enable systemd-homed.service
 enable systemd-userdbd.socket
 
diff --git a/units/meson.build b/units/meson.build
index 8ec9eb94e4..ba3abc29ea 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -226,7 +226,8 @@ in_units = [
          'multi-user.target.wants/'],
         ['systemd-vconsole-setup.service',       'ENABLE_VCONSOLE'],
         ['systemd-volatile-root.service',        ''],
-        ['systemd-repart.service',               'ENABLE_REPART'],
+        ['systemd-repart.service',               'ENABLE_REPART',
+         'sysinit.target.wants/ initrd-root-fs.target.wants/'],
         ['user-runtime-dir@.service',            ''],
         ['user@.service',                        ''],
 ]
diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in
index 41a9d82b93..914d0f7c14 100644
--- a/units/systemd-repart.service.in
+++ b/units/systemd-repart.service.in
@@ -23,7 +23,3 @@ ExecStart=@rootbindir@/systemd-repart --dry-run=no
 
 # The tool returns 77 if there's no existing GPT partition table
 SuccessExitStatus=77
-
-[Install]
-WantedBy=sysinit.target
-WantedBy=initrd-root-fs.target