diff --git a/config/waybar/config.json b/config/waybar/config.json
index 16bfd797..9303df22 100644
--- a/config/waybar/config.json
+++ b/config/waybar/config.json
@@ -54,7 +54,7 @@
     "network": {
       "format": "<span font=\"FontAwesome\"></span> {ipaddr}",
       "format-disconnected": "<span font=\"FontAwesome\"></span> ",
-      "interface": "enp10s0",
+      "interface": "enp8s0",
       "tooltip-format": "{ifname} via {gwaddr}"
     },
 
diff --git a/system/modules/systemd-networkd/default.nix b/system/modules/systemd-networkd/default.nix
index b3e29fc2..fb6a9f79 100644
--- a/system/modules/systemd-networkd/default.nix
+++ b/system/modules/systemd-networkd/default.nix
@@ -23,6 +23,7 @@ in {
     # Main Networks
     systemd.network = {
       enable = true;
+      wait-online.anyInterface = true; # Don't wait for all networks to be configured, as e.g. wg0 will only be upon manual activation
       networks = cfg.networks;
     };
 
diff --git a/system/nixinator/default.nix b/system/nixinator/default.nix
index f2f3472c..6c48cfce 100644
--- a/system/nixinator/default.nix
+++ b/system/nixinator/default.nix
@@ -32,7 +32,7 @@
       networks = {
         # This should override the default network 50-ether
         "10-ether-2_5G" = mylib.networking.mkStaticSystemdNetwork {
-          interface = "enp10s0";
+          interface = "enp8s0";
           ip = ["192.168.86.50/24"];
           router = ["192.168.86.5"];
           nameserver = ["192.168.86.25"];