diff --git a/pkg/performanceprofile/controller/performanceprofile/components/machineconfig/machineconfig.go b/pkg/performanceprofile/controller/performanceprofile/components/machineconfig/machineconfig.go
index b0f1c7b513..f94b985634 100644
--- a/pkg/performanceprofile/controller/performanceprofile/components/machineconfig/machineconfig.go
+++ b/pkg/performanceprofile/controller/performanceprofile/components/machineconfig/machineconfig.go
@@ -80,6 +80,7 @@ const (
 	systemdSectionInstall  = "Install"
 	systemdDescription     = "Description"
 	systemdBefore          = "Before"
+	systemdAfter           = "After"
 	systemdEnvironment     = "Environment"
 	systemdType            = "Type"
 	systemdRemainAfterExit = "RemainAfterExit"
@@ -88,13 +89,17 @@ const (
 )
 
 const (
-	systemdServiceIRQBalance   = "irqbalance.service"
-	systemdServiceKubelet      = "kubelet.service"
-	systemdServiceCrio         = "crio.service"
-	systemdServiceTypeOneshot  = "oneshot"
-	systemdTargetMultiUser     = "multi-user.target"
-	systemdTargetNetworkOnline = "network-online.target"
-	systemdTrue                = "true"
+	systemdServiceIRQBalance     = "irqbalance.service"
+	systemdServiceKubelet        = "kubelet.service"
+	systemdServiceCrio           = "crio.service"
+	systemdServiceTypeOneshot    = "oneshot"
+	systemdTargetMultiUser       = "multi-user.target"
+	systemdTrue                  = "true"
+	systemdServiceNetworkManager = "NetworkManager.service"
+	systemdServiceSSHD           = "sshd.service"
+	systemdServiceDnsmasq        = "dnsmasq.service"
+	systemdServiceDbusBroker     = "dbus-broker.service"
+	systemdServiceGetty          = "getty@tty1.service.service"
 )
 
 const (
@@ -451,7 +456,14 @@ func getCpusetConfigureServiceOptions() []*unit.UnitOption {
 		// Description
 		unit.NewUnitOption(systemdSectionUnit, systemdDescription, "Move services to reserved cpuset"),
 		// Before
-		unit.NewUnitOption(systemdSectionUnit, systemdBefore, systemdTargetNetworkOnline),
+		unit.NewUnitOption(systemdSectionUnit, systemdBefore, systemdServiceKubelet),
+		unit.NewUnitOption(systemdSectionUnit, systemdBefore, systemdServiceCrio),
+		// After
+		unit.NewUnitOption(systemdSectionUnit, systemdAfter, systemdServiceNetworkManager),
+		unit.NewUnitOption(systemdSectionUnit, systemdAfter, systemdServiceSSHD),
+		unit.NewUnitOption(systemdSectionUnit, systemdAfter, systemdServiceDnsmasq),
+		unit.NewUnitOption(systemdSectionUnit, systemdAfter, systemdServiceDbusBroker),
+		unit.NewUnitOption(systemdSectionUnit, systemdAfter, systemdServiceGetty),
 		// Type
 		unit.NewUnitOption(systemdSectionService, systemdType, systemdServiceTypeOneshot),
 		// ExecStart
diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-master_machineconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-master_machineconfig.yaml
index 106b3a958b..3891101f0f 100644
--- a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-master_machineconfig.yaml
+++ b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-master_machineconfig.yaml
@@ -139,7 +139,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot
diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-worker_machineconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-worker_machineconfig.yaml
index 42c28c22b2..c098f5e515 100644
--- a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-worker_machineconfig.yaml
+++ b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-worker_machineconfig.yaml
@@ -139,7 +139,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot
diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_machineconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_machineconfig.yaml
index e1b05cdec2..8db34b4a96 100644
--- a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_machineconfig.yaml
+++ b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_machineconfig.yaml
@@ -139,7 +139,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot
diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_machineconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_machineconfig.yaml
index 42c28c22b2..c098f5e515 100644
--- a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_machineconfig.yaml
+++ b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_machineconfig.yaml
@@ -139,7 +139,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot
diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_machineconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_machineconfig.yaml
index e1b05cdec2..8db34b4a96 100644
--- a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_machineconfig.yaml
+++ b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_machineconfig.yaml
@@ -139,7 +139,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot
diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_machineconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_machineconfig.yaml
index 42c28c22b2..c098f5e515 100644
--- a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_machineconfig.yaml
+++ b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_machineconfig.yaml
@@ -139,7 +139,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot
diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_machineconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_machineconfig.yaml
index 5c25cb1506..db9cf9b2d7 100644
--- a/test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_machineconfig.yaml
+++ b/test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_machineconfig.yaml
@@ -141,7 +141,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot
diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml
index aeff55daa0..6291fe742d 100644
--- a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml
+++ b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml
@@ -142,7 +142,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot
diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/manual_machineconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/manual_machineconfig.yaml
index ff9296a421..673d205dbd 100644
--- a/test/e2e/performanceprofile/testdata/render-expected-output/manual_machineconfig.yaml
+++ b/test/e2e/performanceprofile/testdata/render-expected-output/manual_machineconfig.yaml
@@ -146,7 +146,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot
diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_machineconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_machineconfig.yaml
index 4aca4ae1d1..def48992a1 100644
--- a/test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_machineconfig.yaml
+++ b/test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_machineconfig.yaml
@@ -141,7 +141,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot