diff --git a/cluster/prod/ssh_config b/cluster/prod/ssh_config
index 64b87a4..d1e4a13 100644
--- a/cluster/prod/ssh_config
+++ b/cluster/prod/ssh_config
@@ -23,13 +23,10 @@ Host doradille
 
 Host df-ykl
     HostName df-ykl.machine.deuxfleurs.fr
-    User root
 
 Host df-ymf
     HostName df-ymf.machine.deuxfleurs.fr
-    User root
 
 Host df-ymk
     HostName df-ymk.machine.deuxfleurs.fr
-    User root
 
diff --git a/nix/deuxfleurs.nix b/nix/deuxfleurs.nix
index e2c1c17..edf97fb 100644
--- a/nix/deuxfleurs.nix
+++ b/nix/deuxfleurs.nix
@@ -210,6 +210,7 @@ in
     services.resolved.enable = false;
 
     # Configure Wireguard VPN between all nodes
+    systemd.services."wg-quick-wg0".after = [ "unbound.service" ];
     networking.wg-quick.interfaces.wg0 = {
       address = [ "${cfg.cluster_ip}/16" ];
       listenPort = cfg.wireguard_port;