diff --git a/bgpwtf/machines/modules/bootstrap.nix b/bgpwtf/machines/modules/bootstrap.nix
index 120bf8c..56524d2 100644
--- a/bgpwtf/machines/modules/bootstrap.nix
+++ b/bgpwtf/machines/modules/bootstrap.nix
@@ -6,6 +6,8 @@
   networking.interfaces.bootstrap.ipv4.addresses = [
     { address = "185.236.240.18"; prefixLength = 32; }
   ];
+  systemd.network.networks."40-bootstrap".networkConfig.IgnoreCarrierLoss = true;
+  systemd.network.networks."40-bootstrap".networkConfig.ConfigureWithoutCarrier = true;
   services.atftpd = {
     enable = true;
     root = (let 
diff --git a/bgpwtf/machines/modules/gretap.nix b/bgpwtf/machines/modules/gretap.nix
index f4e1a7b..f28d64c 100644
--- a/bgpwtf/machines/modules/gretap.nix
+++ b/bgpwtf/machines/modules/gretap.nix
@@ -41,22 +41,28 @@
 
   config.boot.kernelModules = [ "fou" ];
   config.systemd.services = mapAttrs' (name: value: nameValuePair "${name}-gretap" {
-    wants = [
+    wants = if config.networking.useNetworkd then [
+      "systemd-networkd.service"
+    ] else [
       "${name}-netdev.service"
       "network-addresses-${value.parent}.service"
     ];
-    after = [
+    after = if config.networking.useNetworkd then [
+      "systemd-networkd.service"
+    ] else [
       "network-addresses-${value.parent}.service"
     ];
-    before = [
+    before = if config.networking.useNetworkd then [] else [
       "network-addresses-${name}.service"
     ];
-    wantedBy = [
+    wantedBy = if config.networking.useNetworkd then [
+      "network-online.target"
+    ] else [
       "network-addresses-${name}.service"
     ];
     serviceConfig = {
       Type = "oneshot";
-      ExecStart = "${pkgs.iproute}/bin/ip link add name ${name} type gretap remote ${value.remoteV4} local ${value.localV4} key ${toString value.id}";
+      ExecStart = "${pkgs.iproute2}/bin/ip link add name ${name} type gretap remote ${value.remoteV4} local ${value.localV4} key ${toString value.id}";
     };
   }) cfg.interfaces;
 }
diff --git a/bgpwtf/machines/modules/router.nix b/bgpwtf/machines/modules/router.nix
index 953b277..f476077 100644
--- a/bgpwtf/machines/modules/router.nix
+++ b/bgpwtf/machines/modules/router.nix
@@ -16,10 +16,11 @@
   environment.systemPackages = with pkgs; [
     tcpdump htop dstat file strace gdb mtr
     vim wget curl htop dstat whois bind
-    rxvt_unicode.terminfo dhcpcd efibootmgr
+    rxvt-unicode-unwrapped.terminfo dhcpcd efibootmgr
   ];
   networking.useDHCP = false;
   networking.firewall.enable = false;
+  networking.useNetworkd = true;
   boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
   boot.kernel.sysctl."net.ipv4.conf.*.accept_redirects" = 0;
   boot.kernel.sysctl."net.ipv4.conf.*.send_redirects" = 0;