diff --git a/units/meson.build b/units/meson.build
index 0d0eeea..e34e5d8 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -68,7 +68,8 @@ units = [
         ['remote-veritysetup.target',           'HAVE_LIBCRYPTSETUP',
          'initrd-root-device.target.wants/'],
         ['remote-fs-pre.target',                ''],
-        ['remote-fs.target',                    ''],
+        ['remote-fs.target',                    '',
+         join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
         ['rescue.target',                       '',
          (with_runlevels ? 'runlevel1.target' : '')],
         ['rpcbind.target',                      ''],
@@ -206,8 +207,11 @@ in_units = [
         ['systemd-modules-load.service',         'HAVE_KMOD',
          'sysinit.target.wants/'],
         ['systemd-network-generator.service',    'ENABLE_NETWORKD'],
-        ['systemd-networkd.service',             'ENABLE_NETWORKD'],
-        ['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD'],
+        ['systemd-networkd.service',             'ENABLE_NETWORKD',
+         join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.network1.service') + ' ' +
+         join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
+        ['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD',
+         join_paths(pkgsysconfdir, 'system/network-online.target.wants/')],
         ['systemd-nspawn@.service',              ''],
         ['systemd-oomd.service',                 'ENABLE_OOMD'],
         ['systemd-portabled.service',            'ENABLE_PORTABLED',
@@ -218,7 +222,9 @@ in_units = [
         ['systemd-random-seed.service',          'ENABLE_RANDOMSEED',
          'sysinit.target.wants/'],
         ['systemd-remount-fs.service',           ''],
-        ['systemd-resolved.service',             'ENABLE_RESOLVE'],
+        ['systemd-resolved.service',             'ENABLE_RESOLVE',
+         join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' +
+         join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
         ['systemd-rfkill.service',               'ENABLE_RFKILL'],
         ['systemd-suspend.service',              ''],
         ['systemd-sysctl.service',               '',