diff --git a/src/usr/lib/systemd/system/one-context-local.service##deb.systemd.one b/src/usr/lib/systemd/system/one-context-local.service##deb.systemd.one
index 6ea4167..41573c0 100644
--- a/src/usr/lib/systemd/system/one-context-local.service##deb.systemd.one
+++ b/src/usr/lib/systemd/system/one-context-local.service##deb.systemd.one
@@ -2,8 +2,8 @@
 Description=OpenNebula pre-networking contextualization script
 DefaultDependencies=no
 Before=network-pre.target
-Wants=network-pre.target local-fs.target dev-disk-by\x2dlabel-CONTEXT.device
-After=local-fs.target dev-disk-by\x2dlabel-CONTEXT.device
+Wants=network-pre.target local-fs.target systemd-udev-settle.service syslog.target
+After=local-fs.target systemd-udev-settle.service syslog.target
 ConditionPathExists=!/var/run/one-context/context.sh.local
 
 [Service]
diff --git a/src/usr/lib/systemd/system/one-context-local.service##rpm.systemd.one b/src/usr/lib/systemd/system/one-context-local.service##rpm.systemd.one
index 042b2ed..f3dfafa 100644
--- a/src/usr/lib/systemd/system/one-context-local.service##rpm.systemd.one
+++ b/src/usr/lib/systemd/system/one-context-local.service##rpm.systemd.one
@@ -1,8 +1,8 @@
 [Unit]
 Description=OpenNebula pre-networking contextualization script
 Before=network-pre.target
-Wants=network-pre.target dev-disk-by\x2dlabel-CONTEXT.device
-After=dev-disk-by\x2dlabel-CONTEXT.device
+Wants=network-pre.target local-fs.target systemd-udev-settle.service syslog.target
+After=local-fs.target systemd-udev-settle.service syslog.target
 ConditionPathExists=!/var/run/one-context/context.sh.local
 
 [Service]
diff --git a/src/usr/lib/systemd/system/one-context-reconfigure-delayed.service##systemd.one b/src/usr/lib/systemd/system/one-context-reconfigure-delayed.service##systemd.one
index df75b99..f345eec 100644
--- a/src/usr/lib/systemd/system/one-context-reconfigure-delayed.service##systemd.one
+++ b/src/usr/lib/systemd/system/one-context-reconfigure-delayed.service##systemd.one
@@ -2,6 +2,7 @@
 Description=OpenNebula delayed reconfiguration script
 After=one-context.service
 Requisite=one-context.service
+ConditionPathExists=/var/run/one-context/context.sh.network
 
 [Service]
 Type=forking
diff --git a/src/usr/lib/systemd/system/one-context-reconfigure.service##systemd.one b/src/usr/lib/systemd/system/one-context-reconfigure.service##systemd.one
index e3bd8f7..6074895 100644
--- a/src/usr/lib/systemd/system/one-context-reconfigure.service##systemd.one
+++ b/src/usr/lib/systemd/system/one-context-reconfigure.service##systemd.one
@@ -3,6 +3,7 @@ Description=OpenNebula reconfiguration script
 After=one-context.service
 Requisite=one-context.service
 Conflicts=one-context-reconfigure-delayed.service
+ConditionPathExists=/var/run/one-context/context.sh.network
 
 [Service]
 Type=oneshot