diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
index dc9d02f0b93..7406c92a5c3 100644
--- a/presets/90-systemd.preset
+++ b/presets/90-systemd.preset
@@ -19,6 +19,7 @@ enable getty@.service
 enable systemd-timesyncd.service
 enable systemd-networkd.service
 enable systemd-resolved.service
+enable systemd-repart.service
 
 disable console-getty.service
 disable debug-shell.service
diff --git a/units/meson.build b/units/meson.build
index ea91f0cc9ea..9964eb79a48 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -228,8 +228,7 @@ in_units = [
          'multi-user.target.wants/'],
         ['systemd-vconsole-setup.service',       'ENABLE_VCONSOLE'],
         ['systemd-volatile-root.service',        ''],
-        ['systemd-repart.service',               'ENABLE_REPART',
-         'sysinit.target.wants/ initrd-root-fs.target.wants/'],
+        ['systemd-repart.service',               'ENABLE_REPART'],
         ['user-runtime-dir@.service',            ''],
         ['user@.service',                        ''],
 ]
diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in
index 7ce6aefd29f..41a9d82b93a 100644
--- a/units/systemd-repart.service.in
+++ b/units/systemd-repart.service.in
@@ -21,5 +21,9 @@ Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootbindir@/systemd-repart --dry-run=no
 
-# The tool returns 77 if there's no GPT partition table pre-existing
+# The tool returns 77 if there's no existing GPT partition table
 SuccessExitStatus=77
+
+[Install]
+WantedBy=sysinit.target
+WantedBy=initrd-root-fs.target