diff --git a/base_arch/etc/one-context.d/00-network b/base_arch/etc/one-context.d/00-network
index e34693b..95ae091 100755
--- a/base_arch/etc/one-context.d/00-network
+++ b/base_arch/etc/one-context.d/00-network
@@ -226,14 +226,5 @@ EOT
     done
 }
 
-configure_network()
-{
-    gen_network_configuration
-
-    systemctl restart systemd-networkd
-
-    sleep 2
-}
-
-configure_network
+gen_network_configuration
 
diff --git a/base_arch/etc/one-context.d/05-hostname b/base_arch/etc/one-context.d/05-hostname
index c5f9e1d..67130f8 100755
--- a/base_arch/etc/one-context.d/05-hostname
+++ b/base_arch/etc/one-context.d/05-hostname
@@ -9,7 +9,7 @@ function set_hostname() {
 
     echo $NAME > $CONFIG_FILE
 
-    hostname $NAME
+    hostnamectl set-hostname $NAME
 }
 
 function get_dns_name() {
diff --git a/base_arch/usr/lib/systemd/system/one-context.service b/base_arch/usr/lib/systemd/system/one-context.service
index 2ee7905..d4f6ccc 100644
--- a/base_arch/usr/lib/systemd/system/one-context.service
+++ b/base_arch/usr/lib/systemd/system/one-context.service
@@ -4,11 +4,11 @@ Description=Context script for open nebula
 # dropped once tuntap is moved to netlink
 After=systemd-udevd.service dbus.service network-pre.target systemd-sysusers.service systemd-sysctl.service
 Before=systemd-networkd.service
-Wants=network.target
+Wants=network.target systemd-networkd.service
 
 # On kdbus systems we pull in the busname explicitly, because it
 # carries policy that allows the daemon to acquire its name.
-Wants=org.freedesktop.network1.busname
+Wants=org.freedesktop.network1.busname systemd-networkd.service
 After=org.freedesktop.network1.busname
 
 [Service]