diff --git a/elements/dhcp-all-interfaces/install.d/dhcp-interface@.service b/elements/dhcp-all-interfaces/install.d/dhcp-interface@.service
index e2643c85f..9935b027d 100644
--- a/elements/dhcp-all-interfaces/install.d/dhcp-interface@.service
+++ b/elements/dhcp-all-interfaces/install.d/dhcp-interface@.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=DHCP interface %I
-After=network.service network.target
+After=network.target
+Before=network-pre.target
+Wants=network-pre.target
 
 ConditionPathExists=!/etc/sysconfig/network-scripts/ifcfg-%I
 
diff --git a/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.service b/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.service
index 6513cd634..50e9d4aa8 100644
--- a/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.service
+++ b/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Ironic Python Agent
-After=network.target
+After=network-online.target
 
 [Service]
 ExecStart=/usr/local/bin/ironic-python-agent