diff --git a/units/dev-hugepages.automount b/units/dev-hugepages.automount
index b9dae85481..dfd3868ef8 100644
--- a/units/dev-hugepages.automount
+++ b/units/dev-hugepages.automount
@@ -8,7 +8,7 @@
 [Unit]
 Description=Huge Pages File System Automount Point
 DefaultDependencies=no
-Before=basic.target
+Before=sysinit.target
 
 [Automount]
 Where=/dev/hugepages
diff --git a/units/dev-mqueue.automount b/units/dev-mqueue.automount
index acdb5427d3..73c4110efd 100644
--- a/units/dev-mqueue.automount
+++ b/units/dev-mqueue.automount
@@ -8,7 +8,7 @@
 [Unit]
 Description=POSIX Message Queue File System Automount Point
 DefaultDependencies=no
-Before=basic.target
+Before=sysinit.target
 
 [Automount]
 Where=/dev/mqueue
diff --git a/units/fedora/plymouth-read-write.service b/units/fedora/plymouth-read-write.service
index ff2f8e440e..09fbf7d4c4 100644
--- a/units/fedora/plymouth-read-write.service
+++ b/units/fedora/plymouth-read-write.service
@@ -9,7 +9,7 @@
 Description=Tell Plymouth To Write Out Runtime Data
 DefaultDependencies=no
 After=local-fs.target
-Before=basic.target
+Before=sysinit.target
 
 [Service]
 ExecStart=-/bin/plymouth update-root-fs --read-write
diff --git a/units/hwclock-load.service b/units/hwclock-load.service
index 6a1951ad09..4deb5c10c7 100644
--- a/units/hwclock-load.service
+++ b/units/hwclock-load.service
@@ -10,7 +10,7 @@ Description=Apply System Clock UTC Offset
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=basic.target shutdown.target udev.service
+Before=sysinit.target shutdown.target udev.service
 
 [Service]
 Type=oneshot
@@ -30,4 +30,4 @@ StandardOutput=syslog
 # system time as part of kernel setup.
 
 [Install]
-WantedBy=basic.target
+WantedBy=sysinit.target
diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
index f9b5cc71db..91f49ef380 100644
--- a/units/proc-sys-fs-binfmt_misc.automount
+++ b/units/proc-sys-fs-binfmt_misc.automount
@@ -8,7 +8,7 @@
 [Unit]
 Description=Arbitrary Executable File Formats File System Automount Point
 DefaultDependencies=no
-Before=basic.target
+Before=sysinit.target
 
 [Automount]
 Where=/proc/sys/fs/binfmt_misc
diff --git a/units/sys-kernel-debug.automount b/units/sys-kernel-debug.automount
index 7b3e041b87..f856a87930 100644
--- a/units/sys-kernel-debug.automount
+++ b/units/sys-kernel-debug.automount
@@ -8,7 +8,7 @@
 [Unit]
 Description=Debug File System Automount Point
 DefaultDependencies=no
-Before=basic.target
+Before=sysinit.target
 
 [Automount]
 Where=/sys/kernel/debug
diff --git a/units/sys-kernel-security.automount b/units/sys-kernel-security.automount
index c43deb7d02..cd13e4a88a 100644
--- a/units/sys-kernel-security.automount
+++ b/units/sys-kernel-security.automount
@@ -8,7 +8,7 @@
 [Unit]
 Description=Security File System Automount Point
 DefaultDependencies=no
-Before=basic.target
+Before=sysinit.target
 
 [Automount]
 Where=/sys/kernel/security
diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 612338b619..739729e692 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -10,7 +10,7 @@ Description=Load Kernel Modules
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 ConditionDirectoryNotEmpty=/etc/modules-load.d
 
 [Service]
diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in
index 8e54db9220..a2b6a557dc 100644
--- a/units/systemd-random-seed-load.service.in
+++ b/units/systemd-random-seed-load.service.in
@@ -11,7 +11,7 @@ DefaultDependencies=no
 Wants=local-fs.target
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 
 [Service]
 Type=oneshot
diff --git a/units/systemd-readahead-collect.service.in b/units/systemd-readahead-collect.service.in
index bcea65efae..1a66f9fa6f 100644
--- a/units/systemd-readahead-collect.service.in
+++ b/units/systemd-readahead-collect.service.in
@@ -10,7 +10,7 @@ Description=Collect Read-Ahead Data
 DefaultDependencies=no
 Wants=systemd-readahead-done.timer
 Conflicts=shutdown.target
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 
 [Service]
 Type=notify
diff --git a/units/systemd-readahead-replay.service.in b/units/systemd-readahead-replay.service.in
index 8ed3b75efe..5cc6defd9b 100644
--- a/units/systemd-readahead-replay.service.in
+++ b/units/systemd-readahead-replay.service.in
@@ -9,7 +9,7 @@
 Description=Replay Read-Ahead Data
 DefaultDependencies=no
 Conflicts=shutdown.target
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 ConditionPathExists=/.readahead
 
 [Service]
diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
index af3ba88e29..ada447885f 100644
--- a/units/systemd-sysctl.service.in
+++ b/units/systemd-sysctl.service.in
@@ -10,7 +10,7 @@ Description=Apply Kernel Variables
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 ConditionPathExists=/etc/sysctl.conf
 ConditionDirectoryNotEmpty=/etc/sysctl.d
 
diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service.in
index 3b27330e02..9d05135438 100644
--- a/units/systemd-tmpfiles-clean.service.in
+++ b/units/systemd-tmpfiles-clean.service.in
@@ -10,7 +10,7 @@ Description=Cleanup of Temporary Directories
 DefaultDependencies=no
 Wants=local-fs.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 ConditionPathExists=/etc/tmpfiles.d
 
 [Service]
diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in
index df80e82be9..d9274edfa3 100644
--- a/units/systemd-tmpfiles-setup.service.in
+++ b/units/systemd-tmpfiles-setup.service.in
@@ -10,7 +10,7 @@ Description=Recreate Volatile Files and Directories
 DefaultDependencies=no
 Wants=local-fs.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 ConditionPathExists=/etc/tmpfiles.d
 
 [Service]
diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
index 19760a906e..91d95d66e3 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -10,7 +10,7 @@ Description=Setup Virtual Console
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
 
 [Service]
 Type=oneshot